Title: [153726] branches/safari-537-branch/Source/WebKit2
- Revision
- 153726
- Author
- lforsch...@apple.com
- Date
- 2013-08-05 15:05:26 -0700 (Mon, 05 Aug 2013)
Log Message
Merged r153724. <rdar://problem/14610818>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153725 => 153726)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-05 21:56:15 UTC (rev 153725)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-05 22:05:26 UTC (rev 153726)
@@ -1,3 +1,20 @@
+2013-08-05 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r153724
+
+ 2013-08-05 Anders Carlsson <ander...@apple.com>
+
+ Ignore the Apple Java placeholder plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=119494
+ <rdar://problem/14610818>
+
+ Reviewed by Beth Dakin.
+
+ Never attempt to load the Java placeholder plug-in.
+
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::shouldUsePlugin):
+
2013-08-01 Lucas Forschler <lforsch...@apple.com>
Merge r153499
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (153725 => 153726)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-08-05 21:56:15 UTC (rev 153725)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-08-05 22:05:26 UTC (rev 153726)
@@ -80,33 +80,6 @@
return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
}
-static size_t findPluginWithBundleIdentifier(const Vector<PluginModuleInfo>& plugins, const String& bundleIdentifier)
-{
- for (size_t i = 0; i < plugins.size(); ++i) {
- if (plugins[i].bundleIdentifier == bundleIdentifier)
- return i;
- }
-
- return notFound;
-}
-
-// Returns true if the given plug-in should be loaded, false otherwise.
-static bool checkForPreferredPlugin(Vector<PluginModuleInfo>& alreadyLoadedPlugins, const PluginModuleInfo& plugin, const String& oldPluginBundleIdentifier, const String& newPluginBundleIdentifier)
-{
- if (plugin.bundleIdentifier == oldPluginBundleIdentifier) {
- // If we've already found the new plug-in, we don't want to load the old plug-in.
- if (findPluginWithBundleIdentifier(alreadyLoadedPlugins, newPluginBundleIdentifier) != notFound)
- return false;
- } else if (plugin.bundleIdentifier == newPluginBundleIdentifier) {
- // If we've already found the old plug-in, remove it from the list of loaded plug-ins.
- size_t oldPluginIndex = findPluginWithBundleIdentifier(alreadyLoadedPlugins, oldPluginBundleIdentifier);
- if (oldPluginIndex != notFound)
- alreadyLoadedPlugins.remove(oldPluginIndex);
- }
-
- return true;
-}
-
static bool shouldBlockPlugin(const PluginModuleInfo& plugin)
{
return PluginInfoStore::defaultLoadPolicyForPlugin(plugin) == PluginModuleBlocked;
@@ -128,8 +101,7 @@
}
}
- // Prefer the Oracle Java plug-in over the Apple java plug-in.
- if (!checkForPreferredPlugin(alreadyLoadedPlugins, plugin, "com.apple.java.JavaAppletPlugin", oracleJavaAppletPluginBundleIdentifier))
+ if (plugin.bundleIdentifier == "com.apple.java.JavaAppletPlugin")
return false;
return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
