Title: [168789] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168788 => 168789)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 06:21:54 UTC (rev 168788)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 06:24:48 UTC (rev 168789)
@@ -1,5 +1,25 @@
2014-04-17 Lucas Forschler <[email protected]>
+ Merge r168489
+
+ 2014-05-08 Tim Horton <[email protected]>
+
+ [wk2] Don't use the XPC-based plugin process for Adobe Reader
+ https://bugs.webkit.org/show_bug.cgi?id=132701
+ <rdar://problem/16792692>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::shouldUseXPC):
+ Rename the debugging default to a more modern and accurate name.
+ Don't use XPC for Adobe Reader.
+
+ (WebKit::PluginProcessProxy::platformGetLaunchOptions):
+ Move the check for plugins that need an executable heap into shouldUseXPC.
+
+2014-04-17 Lucas Forschler <[email protected]>
+
Merge r168473
2014-05-08 Antti Koivisto <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (168788 => 168789)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-05-14 06:21:54 UTC (rev 168788)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-05-14 06:24:48 UTC (rev 168789)
@@ -125,11 +125,19 @@
return true;
}
-static bool shouldUseXPC()
+static bool shouldUseXPC(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
{
- if (id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseXPCServiceForWebProcess"])
+ if (id value = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitUseXPCServiceForPlugIns"])
return [value boolValue];
+ // FIXME: This can be removed when <rdar://problem/16856490> is resolved.
+ if (pluginProcessAttributes.moduleInfo.bundleIdentifier == "com.adobe.acrobat.pdfviewerNPAPI")
+ return false;
+
+ // FIXME: We should still use XPC for plug-ins that want the heap to be executable, see <rdar://problem/16059483>.
+ if (launchOptions.executableHeap)
+ return false;
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
return true;
#else
@@ -147,8 +155,7 @@
if (pluginProcessAttributes.sandboxPolicy == PluginProcessSandboxPolicyUnsandboxed)
launchOptions.extraInitializationData.add("disable-sandbox", "1");
- // FIXME: We should still use XPC for plug-ins that want the heap to be executable, see <rdar://problem/16059483>.
- launchOptions.useXPC = shouldUseXPC() && !launchOptions.executableHeap;
+ launchOptions.useXPC = shouldUseXPC(launchOptions, pluginProcessAttributes);
}
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters& parameters)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
