mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- WebEditingClient merged into WebViewClient requiring changes to BrowserWebViewDelegate. - Remove webkit_glue_plugins.patch for RegisterInternalPlugin() issue 173107 which has been committed as Chromium rev 26595. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@48 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -3,6 +3,4 @@
|
||||
# file entry should be proceeded by the code review or bug report link that it
|
||||
# relates to.
|
||||
patches = {
|
||||
# http://codereview.chromium.org/173107
|
||||
"webkit_glue_plugins" : "../../webkit/glue/plugins/"
|
||||
}
|
||||
|
@ -1,35 +0,0 @@
|
||||
Index: plugin_list.cc
|
||||
===================================================================
|
||||
--- plugin_list.cc (revision 26359)
|
||||
+++ plugin_list.cc (working copy)
|
||||
@@ -141,6 +141,7 @@
|
||||
// other methods if they're called on other threads.
|
||||
std::vector<FilePath> extra_plugin_paths;
|
||||
std::vector<FilePath> extra_plugin_dirs;
|
||||
+ std::vector<PluginVersionInfo> internal_plugins;
|
||||
{
|
||||
AutoLock lock(lock_);
|
||||
if (plugins_loaded_ && !refresh)
|
||||
@@ -148,6 +149,7 @@
|
||||
|
||||
extra_plugin_paths = extra_plugin_paths_;
|
||||
extra_plugin_dirs = extra_plugin_dirs_;
|
||||
+ internal_plugins = internal_plugins_;
|
||||
}
|
||||
|
||||
base::TimeTicks start_time = base::TimeTicks::Now();
|
||||
@@ -157,6 +159,14 @@
|
||||
std::vector<FilePath> directories_to_scan;
|
||||
GetPluginDirectories(&directories_to_scan);
|
||||
|
||||
+ for (size_t i = 0; i < internal_plugins.size(); ++i) {
|
||||
+#if defined(OS_WIN)
|
||||
+ if (internal_plugins[i].path.value() == kDefaultPluginLibraryName)
|
||||
+ continue;
|
||||
+#endif
|
||||
+ LoadPlugin(internal_plugins[i].path, &new_plugins);
|
||||
+ }
|
||||
+
|
||||
for (size_t i = 0; i < extra_plugin_paths.size(); ++i)
|
||||
LoadPlugin(extra_plugin_paths[i], &new_plugins);
|
||||
|
Reference in New Issue
Block a user