<!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>[182447] 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/182447">182447</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-06 17:05:28 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create the web inspector process pool lazily
https://bugs.webkit.org/show_bug.cgi?id=143456
rdar://problem/20146520
Reviewed by Mark Lam.
Add and implement WebInspectorProxy::isInspectorProcessPool instead of always creating the inspector process pool
when trying to determine if a given process pool is the inspector process pool.
This should speed up initialization somewhat and avoid creating a storage manager for example.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::inspectorProcessPool):
(WebKit::WebInspectorProxy::isInspectorProcessPool):
* UIProcess/WebInspectorProxy.h:
* 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="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</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 (182446 => 182447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-06 23:24:58 UTC (rev 182446)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-07 00:05:28 UTC (rev 182447)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-06 Anders Carlsson <andersca@apple.com>
+
+ Create the web inspector process pool lazily
+ https://bugs.webkit.org/show_bug.cgi?id=143456
+ rdar://problem/20146520
+
+ Reviewed by Mark Lam.
+
+ Add and implement WebInspectorProxy::isInspectorProcessPool instead of always creating the inspector process pool
+ when trying to determine if a given process pool is the inspector process pool.
+
+ This should speed up initialization somewhat and avoid creating a storage manager for example.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::inspectorProcessPool):
+ (WebKit::WebInspectorProxy::isInspectorProcessPool):
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getLaunchOptions):
+
</ins><span class="cx"> 2015-04-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Combine ActionMenuHitTestResult with WebHitTestResult
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (182446 => 182447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-04-06 23:24:58 UTC (rev 182446)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-04-07 00:05:28 UTC (rev 182447)
</span><span class="lines">@@ -297,19 +297,29 @@
</span><span class="cx"> m_isProfilingPage = !m_isProfilingPage;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static WebProcessPool* s_processPool;
+
</ins><span class="cx"> WebProcessPool& WebInspectorProxy::inspectorProcessPool()
</span><span class="cx"> {
</span><span class="cx"> // Having our own process pool removes us from the main process pool and
</span><span class="cx"> // guarantees no process sharing for our user interface.
</span><del>- static WebProcessPool* processPool = []{
</del><ins>+ if (!s_processPool) {
</ins><span class="cx"> auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</span><span class="cx"> configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
</span><del>- return &WebProcessPool::create(configuration.get()).leakRef();
- }();
</del><ins>+ s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
+ };
</ins><span class="cx">
</span><del>- return *processPool;
</del><ins>+ return *s_processPool;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebInspectorProxy::isInspectorProcessPool(WebProcessPool& processPool)
+{
+ if (!s_processPool)
+ return false;
+
+ return s_processPool == &processPool;
+}
+
</ins><span class="cx"> bool WebInspectorProxy::isInspectorPage(WebPageProxy& webPage)
</span><span class="cx"> {
</span><span class="cx"> return pageLevelMap().contains(&webPage);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (182446 => 182447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-04-06 23:24:58 UTC (rev 182446)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2015-04-07 00:05:28 UTC (rev 182447)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> bool isProfilingPage() const { return m_isProfilingPage; }
</span><span class="cx"> void togglePageProfiling();
</span><span class="cx">
</span><del>- static WebProcessPool& inspectorProcessPool();
</del><ins>+ static bool isInspectorProcessPool(WebProcessPool&);
</ins><span class="cx"> static bool isInspectorPage(WebPageProxy&);
</span><span class="cx">
</span><span class="cx"> // Provided by platform WebInspectorProxy implementations.
</span><span class="lines">@@ -153,6 +153,8 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebInspectorProxy(WebPageProxy*);
</span><span class="cx">
</span><ins>+ static WebProcessPool& inspectorProcessPool();
+
</ins><span class="cx"> void eagerlyCreateInspectorPage();
</span><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (182446 => 182447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-04-06 23:24:58 UTC (rev 182446)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-04-07 00:05:28 UTC (rev 182447)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span><span class="cx"> launchOptions.processType = ProcessLauncher::WebProcess;
</span><del>- if (&m_processPool.get() == &WebInspectorProxy::inspectorProcessPool())
</del><ins>+ if (WebInspectorProxy::isInspectorProcessPool(m_processPool))
</ins><span class="cx"> launchOptions.extraInitializationData.add(ASCIILiteral("inspector-process"), ASCIILiteral("1"));
</span><span class="cx"> platformGetLaunchOptions(launchOptions);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>