mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-24 16:31:39 +01:00
65b06ebf66
- Printing fix was committed as Chromium rev 23338, so the patches are no longer required. - Add a patch for plugin loading support that was broken in Chromium rev 23501. - NPAPI::PluginList static methods are replaced with methods provided by the singleton instance. - WebPreferences now has an Apply() method. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@35 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
Index: plugin_list.cc
|
|
===================================================================
|
|
--- plugin_list.cc (revision 23814)
|
|
+++ plugin_list.cc (working copy)
|
|
@@ -50,7 +50,7 @@
|
|
|
|
void PluginList::RegisterInternalPlugin(const PluginVersionInfo& info) {
|
|
AutoLock lock(lock_);
|
|
- internal_plugins_.push_back(info);
|
|
+ internal_plugins_.insert(internal_plugins_.begin(), info);
|
|
}
|
|
|
|
bool PluginList::ReadPluginInfo(const FilePath &filename,
|
|
Index: plugin_list_win.cc
|
|
===================================================================
|
|
--- plugin_list_win.cc (revision 23814)
|
|
+++ plugin_list_win.cc (working copy)
|
|
@@ -356,10 +356,15 @@
|
|
}
|
|
|
|
void PluginList::LoadInternalPlugins(std::vector<WebPluginInfo>* plugins) {
|
|
- if (!use_internal_activex_shim_)
|
|
- return;
|
|
- LoadPlugin(FilePath(kActiveXShimFileName), plugins);
|
|
- LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer), plugins);
|
|
+ for (size_t i = 0; i < internal_plugins_.size(); ++i) {
|
|
+ if (!use_internal_activex_shim_ &&
|
|
+ (internal_plugins_[i].path.value() == kActiveXShimFileName ||
|
|
+ internal_plugins_[i].path.value() ==
|
|
+ kActiveXShimFileNameForMediaPlayer)) {
|
|
+ continue;
|
|
+ }
|
|
+ LoadPlugin(internal_plugins_[i].path, plugins);
|
|
+ }
|
|
}
|
|
|
|
} // namespace NPAPI
|