<!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>[196142] 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/196142">196142</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-04 13:02:26 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Give nested inspectors their own process pool
https://bugs.webkit.org/show_bug.cgi?id=153880
<rdar://problem/24508310>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-02-04
Reviewed by Timothy Hatcher.
When inspecting the inspector both inspectors were using the same
Inspector process and sharing the same VM. This meant that profiling
information was confusing (memory and JavaScript sampling) because
it was showing data about both inspectors sharing the same process.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::inspectorProcessPool):
(WebKit::WebInspectorProxy::isInspectorProcessPool):
Have two process pools. The main inspector process pool (1st level inspectors)
and a nested inspector process pool (inspecting the inspector, only expected
by WebKit developers).
* UIProcess/WebInspectorProxy.h:
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
Pass the inspectionLevel to determine the appropriate pool to use.</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="#trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-02-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Give nested inspectors their own process pool
+ https://bugs.webkit.org/show_bug.cgi?id=153880
+ <rdar://problem/24508310>
+
+ Reviewed by Timothy Hatcher.
+
+ When inspecting the inspector both inspectors were using the same
+ Inspector process and sharing the same VM. This meant that profiling
+ information was confusing (memory and JavaScript sampling) because
+ it was showing data about both inspectors sharing the same process.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::inspectorProcessPool):
+ (WebKit::WebInspectorProxy::isInspectorProcessPool):
+ Have two process pools. The main inspector process pool (1st level inspectors)
+ and a nested inspector process pool (inspecting the inspector, only expected
+ by WebKit developers).
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/efl/WebInspectorProxyEfl.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ Pass the inspectionLevel to determine the appropriate pool to use.
+
</ins><span class="cx"> 2016-02-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the !ENABLE(NETSCAPE_PLUGIN_API) build after r196053
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -304,26 +304,25 @@
</span><span class="cx"> m_isProfilingPage = !m_isProfilingPage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static WebProcessPool* s_processPool;
</del><ins>+static WebProcessPool* s_mainInspectorProcessPool;
+static WebProcessPool* s_nestedInspectorProcessPool;
</ins><span class="cx">
</span><del>-WebProcessPool& WebInspectorProxy::inspectorProcessPool()
</del><ins>+WebProcessPool& WebInspectorProxy::inspectorProcessPool(unsigned inspectionLevel)
</ins><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>- if (!s_processPool) {
</del><ins>+ WebProcessPool*& pool = inspectionLevel == 1 ? s_mainInspectorProcessPool : s_nestedInspectorProcessPool;
+ if (!pool) {
</ins><span class="cx"> auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</span><del>- s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
- };
-
- return *s_processPool;
</del><ins>+ pool = &WebProcessPool::create(configuration.get()).leakRef();
+ }
+ return *pool;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebInspectorProxy::isInspectorProcessPool(WebProcessPool& processPool)
</span><span class="cx"> {
</span><del>- if (!s_processPool)
- return false;
-
- return s_processPool == &processPool;
</del><ins>+ return (s_mainInspectorProcessPool && s_mainInspectorProcessPool == &processPool)
+ || (s_nestedInspectorProcessPool && s_nestedInspectorProcessPool == &processPool);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebInspectorProxy::isInspectorPage(WebPageProxy& webPage)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebInspectorProxy(WebPageProxy*);
</span><span class="cx">
</span><del>- static WebProcessPool& inspectorProcessPool();
</del><ins>+ static WebProcessPool& inspectorProcessPool(unsigned inspectionLevel);
</ins><span class="cx">
</span><span class="cx"> void eagerlyCreateInspectorPage();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> if (!m_inspectorWindow)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- WKContextRef wkContext = toAPI(&inspectorProcessPool());
</del><ins>+ WKContextRef wkContext = toAPI(&inspectorProcessPool(inspectionLevel()));
</ins><span class="cx"> WKRetainPtr<WKStringRef> wkGroupIdentifier = adoptWK(WKStringCreateWithUTF8CString(inspectorPageGroupIdentifier().utf8().data()));
</span><span class="cx"> WKPageGroupRef wkPageGroup = WKPageGroupCreateWithIdentifier(wkGroupIdentifier.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> RefPtr<WebPageGroup> pageGroup = WebPageGroup::create(inspectorPageGroupIdentifier(), false, false);
</span><span class="cx">
</span><span class="cx"> auto pageConfiguration = API::PageConfiguration::create();
</span><del>- pageConfiguration->setProcessPool(&inspectorProcessPool());
</del><ins>+ pageConfiguration->setProcessPool(&inspectorProcessPool(inspectionLevel()));
</ins><span class="cx"> pageConfiguration->setPreferences(preferences.get());
</span><span class="cx"> pageConfiguration->setPageGroup(pageGroup.get());
</span><span class="cx"> m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(*pageConfiguration.ptr()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (196141 => 196142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-02-04 20:38:23 UTC (rev 196141)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-02-04 21:02:26 UTC (rev 196142)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> preferences._pageVisibilityBasedProcessSuppressionEnabled = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [configuration setProcessPool: ::WebKit::wrapper(inspectorProcessPool())];
</del><ins>+ [configuration setProcessPool: ::WebKit::wrapper(inspectorProcessPool(inspectionLevel()))];
</ins><span class="cx"> [configuration _setGroupIdentifier:inspectorPageGroupIdentifier()];
</span><span class="cx">
</span><span class="cx"> m_inspectorView = adoptNS([[WKWebInspectorWKWebView alloc] initWithFrame:initialRect configuration:configuration.get()]);
</span></span></pre>
</div>
</div>
</body>
</html>