<!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>[187903] trunk</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/187903">187903</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-04 15:50:48 -0700 (Tue, 04 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Improve some LayoutTests/inspector flakey output for tests with InspectorTest.reloadPage
https://bugs.webkit.org/show_bug.cgi?id=147655

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2015-08-04
Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

* UserInterface/Base/Test.js:
(InspectorTest.reloadPage):
Immediately mark the page as reloading so that any logs that may happen
before the callback for PageAgent.reload wait to be sent after the page
load. What was happening in flakey results was that the logs were
happening before this callback, and therefore getting logged and then
resent after page load and getting relogged.

LayoutTests:

* TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseTestjs">trunk/Source/WebInspectorUI/UserInterface/Base/Test.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187902 => 187903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-08-04 22:48:42 UTC (rev 187902)
+++ trunk/LayoutTests/ChangeLog        2015-08-04 22:50:48 UTC (rev 187903)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-08-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Improve some LayoutTests/inspector flakey output for tests with InspectorTest.reloadPage
+        https://bugs.webkit.org/show_bug.cgi?id=147655
+
+        Reviewed by Timothy Hatcher.
+
+        * TestExpectations:
+
+2015-08-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
</ins><span class="cx">         Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=147328
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (187902 => 187903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations        2015-08-04 22:48:42 UTC (rev 187902)
+++ trunk/LayoutTests/TestExpectations        2015-08-04 22:50:48 UTC (rev 187903)
</span><span class="lines">@@ -98,8 +98,6 @@
</span><span class="cx"> webkit.org/b/147502 inspector/debugger/break-on-uncaught-exception-throw-in-promise-with-catch.html [ Skip ]
</span><span class="cx"> webkit.org/b/147502 inspector/debugger/break-on-uncaught-exception-throw-in-promise.html [ Skip ]
</span><span class="cx"> 
</span><del>-webkit.org/b/147517 inspector/page/main-frame-resource.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/142208 inspector/timeline/debugger-paused-while-recording.html [ Skip ]
</span><span class="cx"> webkit.org/b/142208 inspector/timeline/exception-in-injected-script-while-recording.html [ Skip ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (187902 => 187903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-08-04 22:48:42 UTC (rev 187902)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-08-04 22:50:48 UTC (rev 187903)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Improve some LayoutTests/inspector flakey output for tests with InspectorTest.reloadPage
+        https://bugs.webkit.org/show_bug.cgi?id=147655
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Test.js:
+        (InspectorTest.reloadPage):
+        Immediately mark the page as reloading so that any logs that may happen
+        before the callback for PageAgent.reload wait to be sent after the page
+        load. What was happening in flakey results was that the logs were
+        happening before this callback, and therefore getting logged and then
+        resent after page load and getting relogged.
+
</ins><span class="cx"> 2015-08-04  Devin Rousso  &lt;drousso@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Existing text after completions do not have their completion style removed once hint is applied
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseTestjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Test.js (187902 => 187903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Test.js        2015-08-04 22:48:42 UTC (rev 187902)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Test.js        2015-08-04 22:50:48 UTC (rev 187903)
</span><span class="lines">@@ -223,10 +223,15 @@
</span><span class="cx"> 
</span><span class="cx"> InspectorTest.reloadPage = function(shouldIgnoreCache)
</span><span class="cx"> {
</span><ins>+    console.assert(!this._testPageIsReloading);
+    console.assert(!this._testPageReloadedOnce);
+
+    this._testPageIsReloading = true;
+
</ins><span class="cx">     return PageAgent.reload.promise(!!shouldIgnoreCache)
</span><span class="cx">         .then(function() {
</span><span class="cx">             this._shouldResendResults = true;
</span><del>-            this._testPageIsReloading = true;
</del><ins>+            this._testPageReloadedOnce = true;
</ins><span class="cx"> 
</span><span class="cx">             return Promise.resolve(null);
</span><span class="cx">         }.bind(this));
</span></span></pre>
</div>
</div>

</body>
</html>