<!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>[205299] 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/205299">205299</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-01 11:08:54 -0700 (Thu, 01 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Web Inspector: Remove stale inspector process termination code
https://bugs.webkit.org/show_bug.cgi?id=161465
<rdar://problem/28106584>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-01
Reviewed by Brian Burg.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess): Deleted.
* UIProcess/WebInspectorProxy.h:
* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WKWebInspectorProxyObjCAdapter didRelaunchProcess]): Deleted.
(-[WKWebInspectorWKWebView _didRelaunchProcess]): Deleted.
This code doesn't appear to be run when the WebContent process inside
of an Inspector process crashes. The general WebInspectorProxy has its
own handling of when the page inside an inspector process crashes, so
this Mac specific path appears to be unused and stale.</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="#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 (205298 => 205299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-01 18:00:55 UTC (rev 205298)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-01 18:08:54 UTC (rev 205299)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-09-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ [Mac] Web Inspector: Remove stale inspector process termination code
+ https://bugs.webkit.org/show_bug.cgi?id=161465
+ <rdar://problem/28106584>
+
+ Reviewed by Brian Burg.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess): Deleted.
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (-[WKWebInspectorProxyObjCAdapter didRelaunchProcess]): Deleted.
+ (-[WKWebInspectorWKWebView _didRelaunchProcess]): Deleted.
+ This code doesn't appear to be run when the WebContent process inside
+ of an Inspector process crashes. The general WebInspectorProxy has its
+ own handling of when the page inside an inspector process crashes, so
+ this Mac specific path appears to be unused and stale.
+
</ins><span class="cx"> 2016-09-01 Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix configuration without wayland support
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (205298 => 205299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-09-01 18:00:55 UTC (rev 205298)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-09-01 18:08:54 UTC (rev 205299)
</span><span class="lines">@@ -178,17 +178,6 @@
</span><span class="cx"> didClose();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebInspectorProxy::didRelaunchInspectorPageProcess()
-{
- m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
- m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
-
- // When didRelaunchInspectorPageProcess is called we can assume it is during a load request.
- // Any messages we would have sent to a terminated process need to be re-sent.
-
- m_inspectorPage->process().send(Messages::WebInspectorUI::EstablishConnection(m_connectionIdentifier, m_inspectedPage->pageID(), m_underTest, inspectionLevel()), m_inspectorPage->pageID());
-}
-
</del><span class="cx"> void WebInspectorProxy::showConsole()
</span><span class="cx"> {
</span><span class="cx"> if (!m_inspectedPage)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (205298 => 205299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-09-01 18:00:55 UTC (rev 205298)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-09-01 18:08:54 UTC (rev 205299)
</span><span class="lines">@@ -92,8 +92,6 @@
</span><span class="cx"> void hide();
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>- void didRelaunchInspectorPageProcess();
-
</del><span class="cx"> #if PLATFORM(MAC) && WK_API_ENABLED
</span><span class="cx"> void createInspectorWindow();
</span><span class="cx"> void updateInspectorWindowTitle() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (205298 => 205299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-09-01 18:00:55 UTC (rev 205298)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-09-01 18:08:54 UTC (rev 205299)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx">
</span><span class="cx"> - (id)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy;
</span><span class="cx"> - (void)close;
</span><del>-- (void)didRelaunchProcess;
</del><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -99,11 +98,6 @@
</span><span class="cx"> _inspectorProxy = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didRelaunchProcess
-{
- static_cast<WebInspectorProxy*>(_inspectorProxy)->didRelaunchInspectorPageProcess();
-}
-
</del><span class="cx"> - (void)windowDidMove:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> static_cast<WebInspectorProxy*>(_inspectorProxy)->windowFrameDidChange();
</span><span class="lines">@@ -162,11 +156,6 @@
</span><span class="cx"> return WKInspectorViewTag;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_didRelaunchProcess
-{
- [self.inspectorProxyObjCAdapter didRelaunchProcess];
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>
</body>
</html>