<!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>[200976] 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/200976">200976</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-16 16:08:05 -0700 (Mon, 16 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/200441">r200441</a>): Yahoo sports, finance and news pages automatically scroll
https://bugs.webkit.org/show_bug.cgi?id=157692
&lt;rdar://problem/26231897&gt;

Patch by Aaron Chu &lt;aaron_chu@apple.com&gt; on 2016-05-16
Reviewed by Eric Carlson.

Source/WebCore:

Test: media/video-controls-to-not-scroll-page-on-load.html

This bug was due to the fact that showControls button was shown and focused
when the video controls are hidden. The showControls button is used by FKA or
screen readers to make the video controls reappear after they have faded out.
When the showControls button is shown, a focus() is called on it to ensure that
the screen reader is focusing on the button instead of &lt;body&gt; or the video chrome.
To fix this bug, I added the shouldHaveControls() check before calling focus() on
the showControls button.

* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.showShowControlsButton):

LayoutTests:

Added Layout test to make sure that the page does not scroll automatically because
of the focus() on showControlsButton in the video shadow DOM.

* media/video-controls-to-not-scroll-page-on-load-expected.txt: Added.
* media/video-controls-to-not-scroll-page-on-load.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideocontrolstonotscrollpageonloadexpectedtxt">trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolstonotscrollpageonloadhtml">trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200975 => 200976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-05-16 22:53:21 UTC (rev 200975)
+++ trunk/LayoutTests/ChangeLog        2016-05-16 23:08:05 UTC (rev 200976)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-16  Aaron Chu  &lt;aaron_chu@apple.com&gt;
+
+        REGRESSION (r200441): Yahoo sports, finance and news pages automatically scroll
+        https://bugs.webkit.org/show_bug.cgi?id=157692
+        &lt;rdar://problem/26231897&gt;
+
+        Reviewed by Eric Carlson.
+
+        Added Layout test to make sure that the page does not scroll automatically because
+        of the focus() on showControlsButton in the video shadow DOM.
+
+        * media/video-controls-to-not-scroll-page-on-load-expected.txt: Added.
+        * media/video-controls-to-not-scroll-page-on-load.html: Added.
+
</ins><span class="cx"> 2016-05-16  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed rollout r200924. Caused js/regress/string-replace-generic.html to fail.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolstonotscrollpageonloadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt (0 => 200976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt        2016-05-16 23:08:05 UTC (rev 200976)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolstonotscrollpageonloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html (0 => 200976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html                                (rev 0)
+++ trunk/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html        2016-05-16 23:08:05 UTC (rev 200976)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body onload=&quot;testScroll()&quot;&gt;
+&lt;div style=&quot;width: 256px; height: 2096px; background-color: blue&quot;&gt;&lt;/div&gt; &lt;!-- Dummy content to help make the page scrollable vertically. --&gt;
+&lt;video src=&quot;non-existent.mov&quot; style=&quot;width: 256px; height: 256px; background-color: yellow&quot;&gt;
+    &lt;track src=&quot;non-existent.vtt&quot; kind=&quot;captions&quot;&gt;&lt;/track&gt;
+&lt;/video&gt;
+
+&lt;div id=&quot;result&quot;&gt;FAILED: Test did not run.&lt;/div&gt;
+
+&lt;script&gt;
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+var result = document.getElementById(&quot;result&quot;);
+
+result.innerHTML = &quot;&quot;;
+
+function testScroll () {
+        result.innerHTML += (document.body.scrollTop &lt;= 0)? `PASS`: `FAILED: ${document.body.scrollTop} &gt; 0, the page scrolled automatically.`;
+
+        testRunner.notifyDone();
+}
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200975 => 200976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-16 22:53:21 UTC (rev 200975)
+++ trunk/Source/WebCore/ChangeLog        2016-05-16 23:08:05 UTC (rev 200976)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-16  Aaron Chu  &lt;aaron_chu@apple.com&gt;
+
+        REGRESSION (r200441): Yahoo sports, finance and news pages automatically scroll
+        https://bugs.webkit.org/show_bug.cgi?id=157692
+        &lt;rdar://problem/26231897&gt;
+
+        Reviewed by Eric Carlson.
+
+        Test: media/video-controls-to-not-scroll-page-on-load.html
+
+        This bug was due to the fact that showControls button was shown and focused
+        when the video controls are hidden. The showControls button is used by FKA or 
+        screen readers to make the video controls reappear after they have faded out. 
+        When the showControls button is shown, a focus() is called on it to ensure that
+        the screen reader is focusing on the button instead of &lt;body&gt; or the video chrome.
+        To fix this bug, I added the shouldHaveControls() check before calling focus() on
+        the showControls button.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.showShowControlsButton):
+
</ins><span class="cx"> 2016-05-16  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed rollout r200924. Caused js/regress/string-replace-generic.html to fail.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (200975 => 200976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js        2016-05-16 22:53:21 UTC (rev 200975)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js        2016-05-16 23:08:05 UTC (rev 200976)
</span><span class="lines">@@ -1530,7 +1530,7 @@
</span><span class="cx"> 
</span><span class="cx">     showShowControlsButton: function (shouldShow) {
</span><span class="cx">         this.showControlsButton.hidden = !shouldShow;
</span><del>-        if (shouldShow) 
</del><ins>+        if (shouldShow &amp;&amp; this.shouldHaveControls())
</ins><span class="cx">             this.showControlsButton.focus();
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>