<!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>[179103] trunk/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/179103">179103</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-25 21:01:23 -0800 (Sun, 25 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>fast/html/marquee-scrollamount.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=140851

Reviewed by Darin Adler.

Updated the test to not have a zero delay timer race. Added many comments, because
what is being tested here is quite subtle.

* fast/html/marquee-scrollamount.html:

* platform/efl/fast/html/marquee-scrollamount-expected.txt:
* platform/gtk/fast/html/marquee-scrollamount-expected.txt:
* platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt:
* platform/mac/fast/html/marquee-scrollamount-expected.txt:
The DOM changed slightly, because we now insert the marquee after load event.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasthtmlmarqueescrollamounthtml">trunk/LayoutTests/fast/html/marquee-scrollamount.html</a></li>
<li><a href="#trunkLayoutTestsplatformeflfasthtmlmarqueescrollamountexpectedtxt">trunk/LayoutTests/platform/efl/fast/html/marquee-scrollamount-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkfasthtmlmarqueescrollamountexpectedtxt">trunk/LayoutTests/platform/gtk/fast/html/marquee-scrollamount-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2fasthtmlmarqueescrollamountexpectedtxt">trunk/LayoutTests/platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthtmlmarqueescrollamountexpectedtxt">trunk/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/ChangeLog        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-25  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        fast/html/marquee-scrollamount.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=140851
+
+        Reviewed by Darin Adler.
+
+        Updated the test to not have a zero delay timer race. Added many comments, because
+        what is being tested here is quite subtle.
+
+        * fast/html/marquee-scrollamount.html:
+
+        * platform/efl/fast/html/marquee-scrollamount-expected.txt:
+        * platform/gtk/fast/html/marquee-scrollamount-expected.txt:
+        * platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt:
+        * platform/mac/fast/html/marquee-scrollamount-expected.txt:
+        The DOM changed slightly, because we now insert the marquee after load event.
+
+2015-01-25  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
</ins><span class="cx">         Setting HTMLMarqueeElement.trueSpeed doesn't work
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140863
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasthtmlmarqueescrollamounthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/html/marquee-scrollamount.html (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/marquee-scrollamount.html        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/fast/html/marquee-scrollamount.html        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -1,19 +1,30 @@
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;p&gt;This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate when scrollAmount is set to 0 by script.&lt;/p&gt;
</span><span class="cx"> &lt;script&gt;
</span><del>-    if (window.testRunner)
-        testRunner.waitUntilDone();
</del><ins>+if (window.testRunner)
+    testRunner.waitUntilDone();
+
+onload = function()
+{
</ins><span class="cx">     var marquee = document.createElement(&quot;marquee&quot;);
</span><span class="cx">     marquee.innerHTML = &quot;Test&quot;;
</span><span class="cx">     marquee.width = &quot;100px&quot;;
</span><del>-    marquee.scrollDelay = 0;
</del><ins>+    // We need a non-zero scroll delay and amount for marquee timer to start.
+    marquee.scrollAmount = 6;
+    marquee.scrollDelay = 100000;
</ins><span class="cx">     document.body.appendChild(marquee);
</span><del>-    setTimeout(function() {
-        marquee.scrollAmount = 0;
-        if (window.testRunner) {
-            setTimeout(function() {
-                testRunner.notifyDone();
-            }, 55);
-        }
-    }, 0);
</del><ins>+    // Force layout now, so that marquee starts its timer.
+    marquee.offsetTop;
+    // Verify that changing scrollAmount to 0 actually stops the marquee (the bug
+    // was that starting with 0 worked correctly, but changing to 0 did not).
+    marquee.scrollAmount = 0;
+    // Set the delay to a very low value, so that scrolling would have occured before notifyDone() if not stopped.
+    marquee.trueSpeed = true;
+    marquee.scrollDelay = 1;
+    if (window.testRunner) {
+        setTimeout(function() {
+            testRunner.notifyDone();
+        }, 10);
+    }
+}
</ins><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflfasthtmlmarqueescrollamountexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/fast/html/marquee-scrollamount-expected.txt (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/fast/html/marquee-scrollamount-expected.txt        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/platform/efl/fast/html/marquee-scrollamount-expected.txt        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">           text run at (0,0) width 750: &quot;This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate&quot;
</span><span class="cx">           text run at (0,18) width 250: &quot;when scrollAmount is set to 0 by script.&quot;
</span><span class="cx">       RenderBlock (anonymous) at (0,52) size 784x18
</span><del>-        RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (8,60) size 100x18 scrollX -100
</span><span class="cx">   RenderBlock {MARQUEE} at (0,0) size 100x18
</span><span class="cx">     RenderText {#text} at (0,0) size 27x17
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfasthtmlmarqueescrollamountexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/fast/html/marquee-scrollamount-expected.txt (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/html/marquee-scrollamount-expected.txt        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/platform/gtk/fast/html/marquee-scrollamount-expected.txt        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">           text run at (0,0) width 750: &quot;This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate&quot;
</span><span class="cx">           text run at (0,17) width 250: &quot;when scrollAmount is set to 0 by script.&quot;
</span><span class="cx">       RenderBlock (anonymous) at (0,50) size 784x17
</span><del>-        RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (8,58) size 100x17 scrollX -100
</span><span class="cx">   RenderBlock {MARQUEE} at (0,0) size 100x17
</span><span class="cx">     RenderText {#text} at (0,0) size 27x17
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2fasthtmlmarqueescrollamountexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/fast/html/marquee-scrollamount-expected.txt        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">           text run at (0,0) width 767: &quot;This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate&quot;
</span><span class="cx">           text run at (0,20) width 256: &quot;when scrollAmount is set to 0 by script.&quot;
</span><span class="cx">       RenderBlock (anonymous) at (0,56) size 784x20
</span><del>-        RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (8,64) size 100x20 scrollX -10
</span><span class="cx">   RenderBlock {MARQUEE} at (0,0) size 100x20
</span><span class="cx">     RenderText {#text} at (0,0) size 27x19
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthtmlmarqueescrollamountexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt (179102 => 179103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt        2015-01-26 04:04:53 UTC (rev 179102)
+++ trunk/LayoutTests/platform/mac/fast/html/marquee-scrollamount-expected.txt        2015-01-26 05:01:23 UTC (rev 179103)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">           text run at (0,0) width 766: &quot;This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate&quot;
</span><span class="cx">           text run at (0,18) width 256: &quot;when scrollAmount is set to 0 by script.&quot;
</span><span class="cx">       RenderBlock (anonymous) at (0,52) size 784x18
</span><del>-        RenderText {#text} at (0,0) size 0x0
</del><span class="cx"> layer at (8,60) size 100x18 scrollX -100
</span><span class="cx">   RenderBlock {MARQUEE} at (0,0) size 100x18
</span><span class="cx">     RenderText {#text} at (0,0) size 27x18
</span></span></pre>
</div>
</div>

</body>
</html>