Title: [153864] branches/safari-537-branch/Source/WebKit2
- Revision
- 153864
- Author
- lforsch...@apple.com
- Date
- 2013-08-08 17:02:18 -0700 (Thu, 08 Aug 2013)
Log Message
Merged r153856. <rdar://problem/14267843>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153863 => 153864)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-08 23:57:29 UTC (rev 153863)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-09 00:02:18 UTC (rev 153864)
@@ -1,3 +1,20 @@
+2013-08-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r153856
+
+ 2013-08-08 Gavin Barraclough <barraclo...@apple.com>
+
+ Disable suppression of plugin process for Java
+ https://bugs.webkit.org/show_bug.cgi?id=119604
+
+ Reviewed by Sam Weinig.
+
+ Workaround, the Java plugin doesn't like this.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializeProcess):
+ - +1 active task count on the java plugin, to inhibit supression.
+
2013-08-07 Lucas Forschler <lforsch...@apple.com>
Merge r153775
Modified: branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (153863 => 153864)
--- branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-08-08 23:57:29 UTC (rev 153863)
+++ branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-08-09 00:02:18 UTC (rev 153864)
@@ -415,6 +415,10 @@
return;
m_pluginBundleIdentifier = CFBundleGetIdentifier(pluginBundle.get());
+
+ // FIXME: Workaround for Java not liking its plugin process to be supressed - <rdar://problem/14267843>
+ if (m_pluginBundleIdentifier == "com.oracle.java.JavaAppletPlugin")
+ incrementActiveTaskCount();
}
void PluginProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
