Title: [133704] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 133704
- Author
- [email protected]
- Date
- 2012-11-06 18:04:20 -0800 (Tue, 06 Nov 2012)
Log Message
Merged r128774. <rdar://problem/12514580>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (133703 => 133704)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-07 02:02:17 UTC (rev 133703)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-07 02:04:20 UTC (rev 133704)
@@ -1,3 +1,21 @@
+2012-11-06 Lucas Forschler <[email protected]>
+
+ Merge r128774
+
+ 2012-09-17 Anders Carlsson <[email protected]>
+
+ Don't load a blocked plug-in if a non-blocked version of the same plug-in exists
+ https://bugs.webkit.org/show_bug.cgi?id=96933
+ <rdar://problem/12206720>
+
+ Reviewed by Andreas Kling.
+
+ If a plug-in with the same bundle identifier already exists and it's blocked, remove it and replace it
+ with the other version.
+
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::shouldUsePlugin):
+
2012-11-05 Lucas Forschler <[email protected]>
Merge r125176
@@ -47406,3 +47424,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (133703 => 133704)
--- branches/safari-536.28-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-11-07 02:02:17 UTC (rev 133703)
+++ branches/safari-536.28-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-11-07 02:04:20 UTC (rev 133704)
@@ -109,8 +109,14 @@
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.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
