<!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>[174902] 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/174902">174902</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 12:37:52 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Delay and white area when Web Inspector crashes
https://bugs.webkit.org/show_bug.cgi?id=137230
Reviewed by Anders Carlsson.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::processDidCrash): Added.
(WebKit::WebInspectorProxy::eagerlyCreateInspectorPage): Hook up loader client.</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 (174901 => 174902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-20 19:37:40 UTC (rev 174901)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-20 19:37:52 UTC (rev 174902)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-10-20 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Delay and white area when Web Inspector crashes
+ https://bugs.webkit.org/show_bug.cgi?id=137230
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::processDidCrash): Added.
+ (WebKit::WebInspectorProxy::eagerlyCreateInspectorPage): Hook up loader client.
+
</ins><span class="cx"> 2014-10-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Generate all Inspector domains together in JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (174901 => 174902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-10-20 19:37:40 UTC (rev 174901)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-10-20 19:37:52 UTC (rev 174902)
</span><span class="lines">@@ -388,6 +388,13 @@
</span><span class="cx"> return decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(testPageURL.path());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void processDidCrash(WKPageRef, const void* clientInfo)
+{
+ WebInspectorProxy* webInspectorProxy = static_cast<WebInspectorProxy*>(const_cast<void*>(clientInfo));
+ ASSERT(webInspectorProxy);
+ webInspectorProxy->close();
+}
+
</ins><span class="cx"> static void decidePolicyForNavigationAction(WKPageRef, WKFrameRef frameRef, WKFrameNavigationType, WKEventModifiers, WKEventMouseButton, WKFrameRef, WKURLRequestRef requestRef, WKFramePolicyListenerRef listenerRef, WKTypeRef, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> // Allow non-main frames to navigate anywhere.
</span><span class="lines">@@ -447,15 +454,59 @@
</span><span class="cx">
</span><span class="cx"> WKPagePolicyClientV1 policyClient = {
</span><span class="cx"> { 1, this },
</span><del>- 0, /* decidePolicyForNavigationAction_deprecatedForUseWithV0 */
- 0, /* decidePolicyForNewWindowAction */
- 0, /* decidePolicyForResponse_deprecatedForUseWithV0 */
- 0, /* unableToImplementPolicy */
</del><ins>+ nullptr, // decidePolicyForNavigationAction_deprecatedForUseWithV0
+ nullptr, // decidePolicyForNewWindowAction
+ nullptr, // decidePolicyForResponse_deprecatedForUseWithV0
+ nullptr, // unableToImplementPolicy
</ins><span class="cx"> decidePolicyForNavigationAction,
</span><del>- 0, /* decidePolicyForResponse */
</del><ins>+ nullptr, // decidePolicyForResponse
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+ WKPageLoaderClientV5 loaderClient = {
+ { 5, this },
+ nullptr, // didStartProvisionalLoadForFrame
+ nullptr, // didReceiveServerRedirectForProvisionalLoadForFrame
+ nullptr, // didFailProvisionalLoadWithErrorForFrame
+ nullptr, // didCommitLoadForFrame
+ nullptr, // didFinishDocumentLoadForFrame
+ nullptr, // didFinishLoadForFrame
+ nullptr, // didFailLoadWithErrorForFrame
+ nullptr, // didSameDocumentNavigationForFrame
+ nullptr, // didReceiveTitleForFrame
+ nullptr, // didFirstLayoutForFrame
+ nullptr, // didFirstVisuallyNonEmptyLayoutForFrame
+ nullptr, // didRemoveFrameFromHierarchy
+ nullptr, // didDisplayInsecureContentForFrame
+ nullptr, // didRunInsecureContentForFrame
+ nullptr, // canAuthenticateAgainstProtectionSpaceInFrame
+ nullptr, // didReceiveAuthenticationChallengeInFrame
+ nullptr, // didStartProgress
+ nullptr, // didChangeProgress
+ nullptr, // didFinishProgress
+ nullptr, // didBecomeUnresponsive
+ nullptr, // didBecomeResponsive
+ processDidCrash,
+ nullptr, // didChangeBackForwardList
+ nullptr, // shouldGoToBackForwardListItem
+ nullptr, // didFailToInitializePlugin_deprecatedForUseWithV0
+ nullptr, // didDetectXSSForFrame
+ nullptr, // didNewFirstVisuallyNonEmptyLayout_unavailable
+ nullptr, // willGoToBackForwardListItem
+ nullptr, // interactionOccurredWhileProcessUnresponsive
+ nullptr, // pluginDidFail_deprecatedForUseWithV1
+ nullptr, // didReceiveIntentForFrame_unavailable
+ nullptr, // registerIntentServiceForFrame_unavailable
+ nullptr, // didLayout
+ nullptr, // pluginLoadPolicy_deprecatedForUseWithV2
+ nullptr, // pluginDidFail
+ nullptr, // pluginLoadPolicy
+ nullptr, // webGLLoadPolicy
+ nullptr, // resolveWebGLLoadPolicy
+ nullptr, // shouldKeepCurrentBackForwardListItemInList
+ };
+
</ins><span class="cx"> WKPageSetPagePolicyClient(toAPI(m_inspectorPage), &policyClient.base);
</span><ins>+ WKPageSetPageLoaderClient(toAPI(m_inspectorPage), &loaderClient.base);
</ins><span class="cx">
</span><span class="cx"> m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID(), *this);
</span><span class="cx"> m_inspectorPage->process().assumeReadAccessToBaseURL(inspectorBaseURL());
</span></span></pre>
</div>
</div>
</body>
</html>