<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196499] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196499">196499</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-12 13:11:28 -0800 (Fri, 12 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use different process types for 32-bit and 64-bit plug-ins
https://bugs.webkit.org/show_bug.cgi?id=154186
Reviewed by Tim Horton.
* UIProcess/Databases/DatabaseProcessProxy.cpp:
(WebKit::DatabaseProcessProxy::getLaunchOptions):
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::serviceName):
(WebKit::shouldLeakBoost):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::getLaunchOptions):
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::getLaunchOptions): Deleted.
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformGetLaunchOptions):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getLaunchOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-12 Anders Carlsson <andersca@apple.com>
+
+ Use different process types for 32-bit and 64-bit plug-ins
+ https://bugs.webkit.org/show_bug.cgi?id=154186
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::getLaunchOptions):
+ * UIProcess/Launcher/ProcessLauncher.h:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::serviceName):
+ (WebKit::shouldLeakBoost):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::getLaunchOptions):
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::getLaunchOptions): Deleted.
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::platformGetLaunchOptions):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getLaunchOptions):
+
</ins><span class="cx"> 2016-02-12 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-name isClickableElement in InteractionInformationAtPosition to isElement
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><del>- launchOptions.processType = ProcessLauncher::DatabaseProcess;
</del><ins>+ launchOptions.processType = ProcessLauncher::ProcessType::Database;
</ins><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><span class="cx"> platformGetLaunchOptions(launchOptions);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -45,14 +45,15 @@
</span><span class="cx"> virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum ProcessType {
- WebProcess,
</del><ins>+ enum class ProcessType {
+ Web,
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- PluginProcess,
</del><ins>+ Plugin32,
+ Plugin64,
</ins><span class="cx"> #endif
</span><del>- NetworkProcess,
</del><ins>+ Network,
</ins><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><del>- DatabaseProcess,
</del><ins>+ Database,
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -84,24 +84,19 @@
</span><span class="cx"> static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><span class="cx"> switch (launchOptions.processType) {
</span><del>- case ProcessLauncher::WebProcess:
</del><ins>+ case ProcessLauncher::ProcessType::Web:
</ins><span class="cx"> return "com.apple.WebKit.WebContent" WK_XPC_SERVICE_SUFFIX;
</span><del>- case ProcessLauncher::NetworkProcess:
</del><ins>+ case ProcessLauncher::ProcessType::Network:
</ins><span class="cx"> return "com.apple.WebKit.Networking" WK_XPC_SERVICE_SUFFIX;
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><del>- case ProcessLauncher::DatabaseProcess:
</del><ins>+ case ProcessLauncher::ProcessType::Database:
</ins><span class="cx"> return "com.apple.WebKit.Databases" WK_XPC_SERVICE_SUFFIX;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- case ProcessLauncher::PluginProcess:
- // FIXME: Support plugins that require an executable heap.
- if (launchOptions.architecture == CPU_TYPE_X86)
- return "com.apple.WebKit.Plugin.32" WK_XPC_SERVICE_SUFFIX;
- if (launchOptions.architecture == CPU_TYPE_X86_64)
- return "com.apple.WebKit.Plugin.64" WK_XPC_SERVICE_SUFFIX;
-
- ASSERT_NOT_REACHED();
- return 0;
</del><ins>+ case ProcessLauncher::ProcessType::Plugin32:
+ return "com.apple.WebKit.Plugin.32" WK_XPC_SERVICE_SUFFIX;
+ case ProcessLauncher::ProcessType::Plugin64:
+ return "com.apple.WebKit.Plugin.64" WK_XPC_SERVICE_SUFFIX;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -114,7 +109,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> // On Mac, leak a boost onto the NetworkProcess.
</span><del>- return launchOptions.processType == ProcessLauncher::NetworkProcess;
</del><ins>+ return launchOptions.processType == ProcessLauncher::ProcessType::Network;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><del>- launchOptions.processType = ProcessLauncher::NetworkProcess;
</del><ins>+ launchOptions.processType = ProcessLauncher::ProcessType::Network;
</ins><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><span class="cx"> platformGetLaunchOptions(launchOptions);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx">
</span><span class="cx"> void PluginProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><del>- launchOptions.processType = ProcessLauncher::PluginProcess;
</del><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><span class="cx"> platformGetLaunchOptions(launchOptions, m_pluginProcessAttributes);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -113,6 +113,11 @@
</span><span class="cx">
</span><span class="cx"> void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
</span><span class="cx"> {
</span><ins>+ if (pluginProcessAttributes.moduleInfo.pluginArchitecture == CPU_TYPE_X86)
+ launchOptions.processType = ProcessLauncher::ProcessType::Plugin32;
+ else
+ launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
+
</ins><span class="cx"> launchOptions.architecture = pluginProcessAttributes.moduleInfo.pluginArchitecture;
</span><span class="cx"> launchOptions.executableHeap = PluginProcessProxy::pluginNeedsExecutableHeap(pluginProcessAttributes.moduleInfo);
</span><span class="cx"> launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (196498 => 196499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-12 20:46:30 UTC (rev 196498)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><del>- launchOptions.processType = ProcessLauncher::WebProcess;
</del><ins>+ launchOptions.processType = ProcessLauncher::ProcessType::Web;
</ins><span class="cx">
</span><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>