diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
| commit | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch) | |
| tree | d9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebKit2/UIProcess/Plugins | |
| parent | d0424a769059c84ae20beb3c217812792ea6726b (diff) | |
| download | qtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz | |
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins')
| -rw-r--r-- | Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm index 9b86aaed3..29c744ffd 100644 --- a/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm +++ b/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm @@ -115,8 +115,14 @@ bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlu const PluginModuleInfo& loadedPlugin = alreadyLoadedPlugins[i]; // If a plug-in with the same bundle identifier already exists, we don't want to load it. - if (loadedPlugin.bundleIdentifier == plugin.bundleIdentifier) - return false; + // However, if the already existing plug-in is blocked we want to replace it with the new plug-in. + if (loadedPlugin.bundleIdentifier == plugin.bundleIdentifier) { + if (!shouldBlockPlugin(loadedPlugin)) + return false; + + alreadyLoadedPlugins.remove(i); + break; + } } // Prefer the Oracle Java plug-in over the Apple java plug-in. |