<!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>[210708] branches/safari-603-branch/LayoutTests</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/210708">210708</a></dd>

<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>

<dt>Date</dt> <dd>2017-01-12 22:10:26 -0800 (Thu, 12 Jan 2017)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210622">r210622</a>. rdar://problem/28389364</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>

<li><a href="#branchessafari603branchLayoutTestsinspectorcssmanagerpreferredInspectorStyleSheetForFrameexpectedtxt">branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt</a></li>

<li><a href="#branchessafari603branchLayoutTestsinspectorcssmanagerpreferredInspectorStyleSheetForFramehtml">branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html</a></li>

<li><a href="#branchessafari603branchLayoutTestsplatformmacTestExpectations">branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="branchessafari603branchLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210707 => 210708)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog        2017-01-13 06:10:23 UTC (rev 210707)

+++ branches/safari-603-branch/LayoutTests/ChangeLog        2017-01-13 06:10:26 UTC (rev 210708)

</span><span class="lines">@@ -1,5 +1,22 @@

</span><span class="cx"> 2017-01-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Merge r210622. rdar://problem/28389364

+

+    2017-01-11  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+            REGRESSION(r206133): LayoutTest inspector/css/manager-preferredInspectorStyleSheetForFrame.html is a flaky failure

+            https://bugs.webkit.org/show_bug.cgi?id=162305

+            &lt;rdar://problem/28389364&gt;

+

+            Reviewed by Timothy Hatcher.

+

+            * inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt:

+            * inspector/css/manager-preferredInspectorStyleSheetForFrame.html:

+            Revert the change that broke this and move to more deterministic callbacks

+            that don't include the extra variance in producing output.

+

+2017-01-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

+

</ins><span class="cx">         Merge r210611. rdar://problem/29471892

</span><span class="cx"> 

</span><span class="cx">     2017-01-11  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestsinspectorcssmanagerpreferredInspectorStyleSheetForFrameexpectedtxt"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt (210707 => 210708)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt        2017-01-13 06:10:23 UTC (rev 210707)

+++ branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt        2017-01-13 06:10:26 UTC (rev 210708)

</span><span class="lines">@@ -8,12 +8,12 @@

<span class="cx"> PASS: Should be no stylesheets.

</span><span class="cx"> 

</span><span class="cx"> -- Running test case: CreateMainFrameInspectorStyleSheet

<ins>+PASS: Added StyleSheet origin should be 'inspector'.

+PASS: StyleSheet.isInspectorStyleSheet() should be true.

+PASS: Added StyleSheet frame should be the main frame.

</ins><span class="cx"> PASS: Should be one stylesheet.

<span class="cx"> PASS: StyleSheet origin is inspector.

<span class="cx"> PASS: StyleSheet.isInspectorStyleSheet() should be true.

<del>-PASS: Added StyleSheet origin should be 'inspector'.

-PASS: StyleSheet.isInspectorStyleSheet() should be true.

-PASS: Added StyleSheet frame should be the main frame.

</del><span class="cx"> 

</span><span class="cx"> -- Running test case: AnotherMainFrameRequestDoesNothing

<span class="cx"> PASS: Should still be one stylesheet.

</span><span class="lines">@@ -21,12 +21,12 @@

<span class="cx"> PASS: StyleSheet.isInspectorStyleSheet() should be true.

</span><span class="cx"> 

</span><span class="cx"> -- Running test case: CreateSubFrameInspectorStyleSheet

<ins>+PASS: Added StyleSheet origin should be 'inspector'.

+PASS: StyleSheet.isInspectorStyleSheet() should be true.

+PASS: Added StyleSheet frame should be a child frame.

</ins><span class="cx"> PASS: Should be two stylesheets.

<span class="cx"> PASS: StyleSheet origin should be 'inspector'.

<span class="cx"> PASS: StyleSheet.isInspectorStyleSheet() should be true.

<del>-PASS: Added StyleSheet origin should be 'inspector'.

-PASS: StyleSheet.isInspectorStyleSheet() should be true.

-PASS: Added StyleSheet frame should be a child frame.

</del><span class="cx"> 

</span><span class="cx"> -- Running test case: AnotherSubFrameRequestDoesNothing

<span class="cx"> PASS: Should be two stylesheets.

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestsinspectorcssmanagerpreferredInspectorStyleSheetForFramehtml"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html (210707 => 210708)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html        2017-01-13 06:10:23 UTC (rev 210707)

+++ branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html        2017-01-13 06:10:26 UTC (rev 210708)

</span><span class="lines">@@ -24,8 +24,7 @@

</span><span class="cx">         name: &quot;CreateMainFrameInspectorStyleSheet&quot;,

</span><span class="cx">         description: &quot;First request for main frame should create inspector stylesheet.&quot;,

</span><span class="cx">         test(resolve, reject) {

</span><del>-            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)

-            .then((event) =&gt; {

</del><ins>+            WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) =&gt; {

</ins><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, &quot;Added StyleSheet origin should be 'inspector'.&quot;);

</span><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), &quot;StyleSheet.isInspectorStyleSheet() should be true.&quot;);

</span><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.parentFrame === mainFrame, &quot;Added StyleSheet frame should be the main frame.&quot;);

</span><span class="lines">@@ -61,8 +60,7 @@

</span><span class="cx">         name: &quot;CreateSubFrameInspectorStyleSheet&quot;,

</span><span class="cx">         description: &quot;First request for subframe should create inspector stylesheet.&quot;,

</span><span class="cx">         test(resolve, reject) {

</span><del>-            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)

-            .then((event) =&gt; {

</del><ins>+            WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) =&gt; {

</ins><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, &quot;Added StyleSheet origin should be 'inspector'.&quot;);

</span><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), &quot;StyleSheet.isInspectorStyleSheet() should be true.&quot;);

</span><span class="cx">                 InspectorTest.expectThat(event.data.styleSheet.parentFrame === childFrames[0], &quot;Added StyleSheet frame should be a child frame.&quot;);

</span><span class="lines">@@ -94,8 +92,7 @@

</span><span class="cx">         }

</span><span class="cx">     });

</span><span class="cx"> 

</span><del>-    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)

-    .then((event) =&gt; {

</del><ins>+    WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {

</ins><span class="cx">         InspectorTest.assert(false, &quot;Should not be removing any StyleSheets in this test.&quot;);

</span><span class="cx">     });

</span><span class="cx"> 

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestsplatformmacTestExpectations"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations (210707 => 210708)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations        2017-01-13 06:10:23 UTC (rev 210707)

+++ branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations        2017-01-13 06:10:26 UTC (rev 210708)

</span><span class="lines">@@ -1210,8 +1210,6 @@

</span><span class="cx"> webkit.org/b/156634 inspector/formatting/formatting-javascript.html [ Pass Timeout ]

</span><span class="cx"> webkit.org/b/158948 inspector/timeline [ Pass Timeout ]

</span><span class="cx"> 

</span><del>-webkit.org/b/162305 inspector/css/manager-preferredInspectorStyleSheetForFrame.html [ Pass Failure ]

-

</del><span class="cx"> # Colorspaces on CA OpenGL layers not available in Yosemite

</span><span class="cx"> [ Yosemite ] fast/canvas/webgl/match-page-color-space.html [ Skip ]

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>