<!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>[194544] 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/194544">194544</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 11:39:54 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: reproducible debug ASSERT when inspecting the inspector (WK2)
https://bugs.webkit.org/show_bug.cgi?id=152080
Reviewed by Timothy Hatcher.
We hit an assert underneath ChildProcessProxy::addMessageReceiver when opening Inspector[2]
because we try to add WebInpectorProxy as a message receiver twice for the same process.
On investigating, I found several interrelated issues that caused this state of affairs:
- WebInspectorProxy adds message receivers for inspector page's WebProcess and the
inspected page's WebProcess. When inspecting the inspector, we mistakenly add a receiver
again because the inspector is now the inspected page.
- We mixed up process ids when adding message receivers.
- invalidate() is re-entrant, causing us to try and double-remove the message receiver.
Fix this by removing add/remove of message recievers for the inspector page when then
inspected page is itself an inspector page. In that case, the receivers are managed by
the inspector page's WebInspectorProxy instance.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::invalidate): Re-arrange to guard against useless reentrancy.
(WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess):
(WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):
(WebKit::WebInspectorProxy::didClose):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194543 => 194544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-04 19:34:23 UTC (rev 194543)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-04 19:39:54 UTC (rev 194544)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-04 Brian Burg <bburg@apple.com>
+
+ Web Inspector: reproducible debug ASSERT when inspecting the inspector (WK2)
+ https://bugs.webkit.org/show_bug.cgi?id=152080
+
+ Reviewed by Timothy Hatcher.
+
+ We hit an assert underneath ChildProcessProxy::addMessageReceiver when opening Inspector[2]
+ because we try to add WebInpectorProxy as a message receiver twice for the same process.
+
+ On investigating, I found several interrelated issues that caused this state of affairs:
+
+ - WebInspectorProxy adds message receivers for inspector page's WebProcess and the
+ inspected page's WebProcess. When inspecting the inspector, we mistakenly add a receiver
+ again because the inspector is now the inspected page.
+ - We mixed up process ids when adding message receivers.
+ - invalidate() is re-entrant, causing us to try and double-remove the message receiver.
+
+ Fix this by removing add/remove of message recievers for the inspector page when then
+ inspected page is itself an inspector page. In that case, the receivers are managed by
+ the inspector page's WebInspectorProxy instance.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::invalidate): Re-arrange to guard against useless reentrancy.
+ (WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess):
+ (WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):
+ (WebKit::WebInspectorProxy::didClose):
+
</ins><span class="cx"> 2016-01-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix after r194536 when using NetworkSession.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (194543 => 194544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-01-04 19:34:23 UTC (rev 194543)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-01-04 19:39:54 UTC (rev 194544)
</span><span class="lines">@@ -108,13 +108,17 @@
</span><span class="cx"> WebInspectorServer::singleton().unregisterPage(m_remoteInspectionPageId);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // We can be called reentrantly through platformInvalidate(), in which case nothing needs to be done.
+ if (!m_inspectedPage)
+ return;
+
</ins><span class="cx"> m_inspectedPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
</span><span class="cx">
</span><ins>+ pageLevelMap().remove(m_inspectedPage);
+ m_inspectedPage = nullptr;
+
</ins><span class="cx"> didClose();
</span><span class="cx"> platformInvalidate();
</span><del>-
- pageLevelMap().remove(m_inspectedPage);
- m_inspectedPage = nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public APIs
</span><span class="lines">@@ -180,7 +184,8 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::didRelaunchInspectorPageProcess()
</span><span class="cx"> {
</span><del>- m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</del><ins>+ if (inspectionLevel() == 1)
+ m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</ins><span class="cx"> m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
</span><span class="cx">
</span><span class="cx"> // When didRelaunchInspectorPageProcess is called we can assume it is during a load request.
</span><span class="lines">@@ -510,7 +515,8 @@
</span><span class="cx"> WKPageSetPageLoaderClient(toAPI(m_inspectorPage), &loaderClient.base);
</span><span class="cx"> WKPageSetPageContextMenuClient(toAPI(m_inspectorPage), &contextMenuClient.base);
</span><span class="cx">
</span><del>- m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</del><ins>+ if (inspectionLevel() == 1)
+ m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</ins><span class="cx"> m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -572,7 +578,9 @@
</span><span class="cx"> if (!m_inspectorPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
</del><ins>+ if (inspectionLevel() == 1)
+ m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectorPage->pageID());
+
</ins><span class="cx"> m_inspectorPage = nullptr;
</span><span class="cx">
</span><span class="cx"> m_isVisible = false;
</span></span></pre>
</div>
</div>
</body>
</html>