<!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>[171409] branches/safari-600.1-branch</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/171409">171409</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 22:39:05 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171167">r171167</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6001branchToolsChangeLog">branches/safari-600.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001branchToolsWebKitTestRunnerTestControllercpp">branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#branchessafari6001branchToolsWebKitTestRunnerTestControllerh">branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#branchessafari6001branchToolsWebKitTestRunnerTestInvocationcpp">branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171167.
+
+ 2014-07-16 Alexey Proskuryakov <ap@apple.com>
+
+ A test that hangs at cleanup stage confuses webkitpy hugely
+ https://bugs.webkit.org/show_bug.cgi?id=122475
+ <rdar://problem/17184354>
+
+ Reviewed by Anders Carlsson.
+
+ Reset m_pageLoadState when the process exits cleanly - otherwise messages from a
+ new process for the same WebPageProxy would hit assertions.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::processDidCrash):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171197.
</span><span class="cx">
</span><span class="cx"> 2014-07-17 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -4276,10 +4276,6 @@
</span><span class="cx">
</span><span class="cx"> resetStateAfterProcessExited();
</span><span class="cx">
</span><del>- // FIXME: Should we do this when the process exits cleanly, instead of just upon crashing?
- auto transaction = m_pageLoadState.transaction();
- m_pageLoadState.reset(transaction);
-
</del><span class="cx"> m_loaderClient->processDidCrash(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4434,6 +4430,9 @@
</span><span class="cx"> dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> m_pageClient.dismissDictionaryLookupPanel();
</span><span class="cx"> #endif
</span><ins>+
+ auto transaction = m_pageLoadState.transaction();
+ m_pageLoadState.reset(transaction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageCreationParameters WebPageProxy::creationParameters()
</span></span></pre></div>
<a id="branchessafari6001branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/ChangeLog (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171167.
+
+ 2014-07-16 Alexey Proskuryakov <ap@apple.com>
+
+ A test that hangs at cleanup stage confuses webkitpy hugely
+ https://bugs.webkit.org/show_bug.cgi?id=122475
+ <rdar://problem/17184354>
+
+ Reviewed by Anders Carlsson.
+
+ Terminate WebContent process if it freezes between tests. Ideally, we should report
+ this somehow, but this is better than blaming the wrong test.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::terminateWebContentProcess):
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::invoke):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171199.
</span><span class="cx">
</span><span class="cx"> 2014-07-17 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="branchessafari6001branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -668,6 +668,10 @@
</span><span class="cx"> return m_doneResetting;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestController::terminateWebContentProcess()
+{
+ WKPageTerminate(m_mainWebView->page());
+}
</ins><span class="cx">
</span><span class="cx"> void TestController::updateWebViewSizeForTest(const TestInvocation& test)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6001branchToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> bool resetStateToConsistentValues();
</span><span class="cx"> void resetPreferencesToConsistentValues();
</span><span class="cx">
</span><ins>+ void terminateWebContentProcess();
+
</ins><span class="cx"> WorkQueueManager& workQueueManager() { return m_workQueueManager; }
</span><span class="cx">
</span><span class="cx"> void setHandlesAuthenticationChallenges(bool value) { m_handlesAuthenticationChallenges = value; }
</span></span></pre></div>
<a id="branchessafari6001branchToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp (171408 => 171409)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2014-07-23 05:33:36 UTC (rev 171408)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2014-07-23 05:39:05 UTC (rev 171409)
</span><span class="lines">@@ -202,8 +202,10 @@
</span><span class="cx"> if (m_webProcessIsUnresponsive)
</span><span class="cx"> dumpWebProcessUnresponsiveness();
</span><span class="cx"> else if (!TestController::shared().resetStateToConsistentValues()) {
</span><del>- m_errorMessage = "Timed out loading about:blank before the next test";
- dumpWebProcessUnresponsiveness();
</del><ins>+ // The process froze while loading about:blank, let's start a fresh one.
+ // It would be nice to report that the previous test froze after dumping results, but we have no way to do that.
+ TestController::shared().terminateWebContentProcess();
+ TestController::shared().resetStateToConsistentValues();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>