diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index a87a9f85f..85b91ae19 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -17,5 +17,5 @@ { 'chromium_url': 'http://src.chromium.org/svn/trunk/src', - 'chromium_revision': '107708', + 'chromium_revision': '108684', } diff --git a/libcef/browser_resource_loader_bridge.cc b/libcef/browser_resource_loader_bridge.cc index dc264ead8..0fb6f71cf 100644 --- a/libcef/browser_resource_loader_bridge.cc +++ b/libcef/browser_resource_loader_bridge.cc @@ -696,7 +696,7 @@ class RequestProxy : public net::URLRequest::Delegate, auth_info->realm, auth_info->scheme, username, password)) { - request->SetAuth(username, password); + request->SetAuth(net::AuthCredentials(username, password)); return; } } diff --git a/libcef/simple_clipboard_impl.cc b/libcef/simple_clipboard_impl.cc index b521a656a..d55460ac7 100644 --- a/libcef/simple_clipboard_impl.cc +++ b/libcef/simple_clipboard_impl.cc @@ -35,16 +35,20 @@ ui::Clipboard* ClipboardGetClipboard() { return clipboard.Pointer(); } +uint64 ClipboardGetSequenceNumber() { + return ClipboardGetClipboard()->GetSequenceNumber(); +} + bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format, ui::Clipboard::Buffer buffer) { return ClipboardGetClipboard()->IsFormatAvailable(format, buffer); } -// TODO(dcheng): Implement. void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector* types, bool* contains_filenames) { - return; + return ClipboardGetClipboard()->ReadAvailableTypes(buffer, types, + contains_filenames); } void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) { @@ -86,18 +90,4 @@ void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) { } } -bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, - string16* data, string16* metadata) { - return false; -} - -bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, - std::vector* filenames) { - return false; -} - -uint64 ClipboardGetSequenceNumber() { - return 0; -} - } // namespace webkit_glue diff --git a/patch/patch.cfg b/patch/patch.cfg index 08d6da207..f4122f7ec 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -21,11 +21,6 @@ patches = [ 'name': 'tools_gyp', 'path': '../tools/gyp/', }, - { - # http://codereview.chromium.org/8386002/ - 'name': 'webkit_plugins_npapi', - 'path': '../webkit/plugins/npapi/', - }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=364 'name': 'spi_webcore_364', diff --git a/patch/patches/base.patch b/patch/patches/base.patch index 15c893153..075cfde7d 100644 --- a/patch/patches/base.patch +++ b/patch/patches/base.patch @@ -1,6 +1,6 @@ Index: message_loop.cc =================================================================== ---- message_loop.cc (revision 107708) +--- message_loop.cc (revision 108684) +++ message_loop.cc (working copy) @@ -403,9 +403,13 @@ } @@ -16,12 +16,12 @@ Index: message_loop.cc + return incoming_queue_.empty(); } - //------------------------------------------------------------------------------ + bool MessageLoop::is_running() const { Index: message_loop.h =================================================================== ---- message_loop.h (revision 107708) +--- message_loop.h (revision 108684) +++ message_loop.h (working copy) -@@ -367,6 +367,9 @@ +@@ -366,6 +366,9 @@ // Asserts that the MessageLoop is "idle". void AssertIdle() const; diff --git a/patch/patches/webkit_plugins_npapi.patch b/patch/patches/webkit_plugins_npapi.patch deleted file mode 100644 index a8bdf8e98..000000000 --- a/patch/patches/webkit_plugins_npapi.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: plugin_list.cc -=================================================================== ---- plugin_list.cc (revision 107708) -+++ plugin_list.cc (working copy) -@@ -223,26 +223,22 @@ - default_plugin_enabled_ = true; - } - --void PluginList::RegisterInternalPlugin(const FilePath& filename, -- const std::string& name, -- const std::string& description, -- const std::string& mime_type_str, -- const PluginEntryPoints& entry_points) { -- InternalPlugin plugin; -- plugin.info.path = filename; -- plugin.info.name = ASCIIToUTF16(name); -- plugin.info.version = ASCIIToUTF16("1"); -- plugin.info.desc = ASCIIToUTF16(description); -+void PluginList::RegisterInternalPlugin(const webkit::WebPluginInfo& info, -+ const PluginEntryPoints& entry_points, -+ bool add_at_beginning) { -+ InternalPlugin plugin = { info, entry_points }; - -- webkit::WebPluginMimeType mime_type; -- mime_type.mime_type = mime_type_str; -- plugin.info.mime_types.push_back(mime_type); -+ base::AutoLock lock(lock_); - -- plugin.entry_points = entry_points; -+ if (add_at_beginning) { -+ // Newer registrations go earlier in the list so they can override the MIME -+ // types of older registrations. -+ internal_plugins_.insert(internal_plugins_.begin(), plugin); -+ } else { -+ internal_plugins_.push_back(plugin); -+ } - -- base::AutoLock lock(lock_); -- internal_plugins_.push_back(plugin); -- if (filename.value() == kDefaultPluginLibraryName) -+ if (info.path.value() == kDefaultPluginLibraryName) - default_plugin_enabled_ = true; - } - -Index: plugin_list.h -=================================================================== ---- plugin_list.h (revision 107708) -+++ plugin_list.h (working copy) -@@ -85,16 +85,13 @@ - // be loaded using PluginList::LoadPlugin(). - void RegisterInternalPlugin(const webkit::WebPluginInfo& info); - -- // This second version is for "plugins" that have been compiled -- // directly into the binary -- callers must provide the metadata and -- // the entry points. -- // TODO(evan): we use file names here, but they're not really files, they're -- // actually a string that uniquely identifies the plugin. -- void RegisterInternalPlugin(const FilePath& filename, -- const std::string& name, -- const std::string& description, -- const std::string& mime_type, -- const PluginEntryPoints& entry_points); -+ // This second version is for "plugins" that have been compiled directly into -+ // the binary -- callers must provide the plugin information and the entry -+ // points. If |add_at_beginning| is true the plugin will be added earlier in -+ // the list so that it can override the MIME types of older registrations. -+ void RegisterInternalPlugin(const webkit::WebPluginInfo& info, -+ const PluginEntryPoints& entry_points, -+ bool add_at_beginning); - - // Removes a specified internal plugin from the list. The search will match - // on the path from the version info previously registered.