<!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>[205370] 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/205370">205370</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-02 13:57:54 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: If inspector process crashes, re-inspecting the page does not work
https://bugs.webkit.org/show_bug.cgi?id=161502
<rdar://problem/28120368>
Reviewed by Brian Burg.
This is an issue on Mac because WebInspectorProxyMac's platformDidClose
doesn't immediately get rid of the WKWebView for the inspector. This is
intended so that a quick close and reopen of Web Inspector is faster,
however in the case where the WebPage under the WKWebView crashed, we
actually should clear things instead of using the timer path. Provide
a stronger platform close handler when the inspector page crashed.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::closeForCrash):
(WebKit::webProcessDidCrash):
(WebKit::WebInspectorProxy::platformDidCloseForCrash):
Go through a stronger path when the web process crashes.
Some platforms may want to handle this differently then the user
closing a web inspector window.
* UIProcess/WebInspectorProxy.h:
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformDidCloseForCrash):
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformDidCloseForCrash):
These platforms do not need to do anything special.
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::closeTimerFired):
Loosen this code. There is no need for it to be so strict.
(WebKit::WebInspectorProxy::platformDidCloseForCrash):
If the inspector page crashed, close our handles immediately.</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 (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-09-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: If inspector process crashes, re-inspecting the page does not work
+ https://bugs.webkit.org/show_bug.cgi?id=161502
+ <rdar://problem/28120368>
+
+ Reviewed by Brian Burg.
+
+ This is an issue on Mac because WebInspectorProxyMac's platformDidClose
+ doesn't immediately get rid of the WKWebView for the inspector. This is
+ intended so that a quick close and reopen of Web Inspector is faster,
+ however in the case where the WebPage under the WKWebView crashed, we
+ actually should clear things instead of using the timer path. Provide
+ a stronger platform close handler when the inspector page crashed.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::closeForCrash):
+ (WebKit::webProcessDidCrash):
+ (WebKit::WebInspectorProxy::platformDidCloseForCrash):
+ Go through a stronger path when the web process crashes.
+ Some platforms may want to handle this differently then the user
+ closing a web inspector window.
+
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/efl/WebInspectorProxyEfl.cpp:
+ (WebKit::WebInspectorProxy::platformDidCloseForCrash):
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformDidCloseForCrash):
+ These platforms do not need to do anything special.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::closeTimerFired):
+ Loosen this code. There is no need for it to be so strict.
+
+ (WebKit::WebInspectorProxy::platformDidCloseForCrash):
+ If the inspector page crashed, close our handles immediately.
+
+2016-09-02 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Provide a way to open an inspector frontend for a remote target
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161515
</span><span class="cx"> <rdar://problem/13182127>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -160,6 +160,13 @@
</span><span class="cx"> didClose();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::closeForCrash()
+{
+ close();
+
+ platformDidCloseForCrash();
+}
+
</ins><span class="cx"> void WebInspectorProxy::showConsole()
</span><span class="cx"> {
</span><span class="cx"> if (!m_inspectedPage)
</span><span class="lines">@@ -319,7 +326,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspectorProxy* webInspectorProxy = static_cast<WebInspectorProxy*>(const_cast<void*>(clientInfo));
</span><span class="cx"> ASSERT(webInspectorProxy);
</span><del>- webInspectorProxy->close();
</del><ins>+ webInspectorProxy->closeForCrash();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void decidePolicyForNavigationAction(WKPageRef pageRef, WKNavigationActionRef navigationActionRef, WKFramePolicyListenerRef listenerRef, WKTypeRef, const void* clientInfo)
</span><span class="lines">@@ -638,6 +645,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformDidCloseForCrash()
+{
+ notImplemented();
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformInvalidate()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> void show();
</span><span class="cx"> void hide();
</span><span class="cx"> void close();
</span><ins>+ void closeForCrash();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && WK_API_ENABLED
</span><span class="cx"> static RetainPtr<WKWebViewConfiguration> createFrontendConfiguration(WebPageProxy*, bool underTest);
</span><span class="lines">@@ -176,6 +177,7 @@
</span><span class="cx"> WebPageProxy* platformCreateInspectorPage();
</span><span class="cx"> void platformOpen();
</span><span class="cx"> void platformDidClose();
</span><ins>+ void platformDidCloseForCrash();
</ins><span class="cx"> void platformInvalidate();
</span><span class="cx"> void platformBringToFront();
</span><span class="cx"> void platformHide();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebInspectorProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -146,6 +146,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformDidCloseForCrash()
+{
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformInvalidate()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -214,6 +214,10 @@
</span><span class="cx"> m_inspectorView = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformDidCloseForCrash()
+{
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformInvalidate()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (205369 => 205370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-09-02 20:57:51 UTC (rev 205369)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-09-02 20:57:54 UTC (rev 205370)
</span><span class="lines">@@ -162,8 +162,6 @@
</span><span class="cx"> void WebInspectorProxy::closeTimerFired()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isAttached || !m_inspectorWindow);
</span><del>- if (m_isAttached || m_inspectorWindow)
- return;
</del><span class="cx">
</span><span class="cx"> if (m_inspectorView) {
</span><span class="cx"> m_inspectorView->_page->close();
</span><span class="lines">@@ -170,10 +168,12 @@
</span><span class="cx"> m_inspectorView = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [[NSNotificationCenter defaultCenter] removeObserver:m_inspectorProxyObjCAdapter.get()];
</del><ins>+ if (m_inspectorProxyObjCAdapter) {
+ [[NSNotificationCenter defaultCenter] removeObserver:m_inspectorProxyObjCAdapter.get()];
</ins><span class="cx">
</span><del>- [m_inspectorProxyObjCAdapter close];
- m_inspectorProxyObjCAdapter = nil;
</del><ins>+ [m_inspectorProxyObjCAdapter close];
+ m_inspectorProxyObjCAdapter = nil;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::createInspectorWindow()
</span><span class="lines">@@ -351,6 +351,13 @@
</span><span class="cx"> m_closeTimer.startOneShot(webViewCloseTimeout);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebInspectorProxy::platformDidCloseForCrash()
+{
+ m_closeTimer.stop();
+
+ closeTimerFired();
+}
+
</ins><span class="cx"> void WebInspectorProxy::platformInvalidate()
</span><span class="cx"> {
</span><span class="cx"> m_closeTimer.stop();
</span></span></pre>
</div>
</div>
</body>
</html>