[webkit-changes] [201034] branches/safari-602.1.32-branch

Tue, 17 May 2016 11:49:57 -0700

Title: [201034] branches/safari-602.1.32-branch

Diff

Modified: branches/safari-602.1.32-branch/LayoutTests/ChangeLog (201033 => 201034)


--- branches/safari-602.1.32-branch/LayoutTests/ChangeLog	2016-05-17 18:49:25 UTC (rev 201033)
+++ branches/safari-602.1.32-branch/LayoutTests/ChangeLog	2016-05-17 18:49:27 UTC (rev 201034)
@@ -1,5 +1,23 @@
 2016-05-17  Babak Shafiei  <[email protected]>
 
+        Merge r200976. rdar://problem/26231897
+
+    2016-05-16  Aaron Chu  <[email protected]>
+
+            REGRESSION (r200441): Yahoo sports, finance and news pages automatically scroll
+            https://bugs.webkit.org/show_bug.cgi?id=157692
+            <rdar://problem/26231897>
+
+            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.
+
+2016-05-17  Babak Shafiei  <[email protected]>
+
         Merge r200939. rdar://problem/26180740
 
     2016-05-16  Said Abou-Hallawa  <[email protected]>

Added: branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt (0 => 201034)


--- branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt	                        (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load-expected.txt	2016-05-17 18:49:27 UTC (rev 201034)
@@ -0,0 +1,2 @@
+
+PASS

Added: branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html (0 => 201034)


--- branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html	                        (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/media/video-controls-to-not-scroll-page-on-load.html	2016-05-17 18:49:27 UTC (rev 201034)
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<body _onload_="testScroll()">
+<div style="width: 256px; height: 2096px; background-color: blue"></div> <!-- Dummy content to help make the page scrollable vertically. -->
+<video src="" style="width: 256px; height: 256px; background-color: yellow">
+    <track src="" kind="captions"></track>
+</video>
+
+<div id="result">FAILED: Test did not run.</div>
+
+<script>
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+var result = document.getElementById("result");
+
+result.innerHTML = "";
+
+function testScroll () {
+	result.innerHTML += (document.body.scrollTop <= 0)? `PASS`: `FAILED: ${document.body.scrollTop} > 0, the page scrolled automatically.`;
+
+	testRunner.notifyDone();
+}
+</script>
+</body>
+</html>
\ No newline at end of file

Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201033 => 201034)


--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog	2016-05-17 18:49:25 UTC (rev 201033)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog	2016-05-17 18:49:27 UTC (rev 201034)
@@ -1,5 +1,30 @@
 2016-05-17  Babak Shafiei  <[email protected]>
 
+        Merge r200976. rdar://problem/26231897
+
+    2016-05-16  Aaron Chu  <[email protected]>
+
+            REGRESSION (r200441): Yahoo sports, finance and news pages automatically scroll
+            https://bugs.webkit.org/show_bug.cgi?id=157692
+            <rdar://problem/26231897>
+
+            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 <body> 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):
+
+2016-05-17  Babak Shafiei  <[email protected]>
+
         Merge r200939. rdar://problem/26180740
 
     2016-05-16  Said Abou-Hallawa  <[email protected]>

Modified: branches/safari-602.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (201033 => 201034)


--- branches/safari-602.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2016-05-17 18:49:25 UTC (rev 201033)
+++ branches/safari-602.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2016-05-17 18:49:27 UTC (rev 201034)
@@ -1522,7 +1522,7 @@
 
     showShowControlsButton: function (shouldShow) {
         this.showControlsButton.hidden = !shouldShow;
-        if (shouldShow) 
+        if (shouldShow && this.shouldHaveControls())
             this.showControlsButton.focus();
     },
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to