<!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>[200441] 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/200441">200441</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-04 17:05:47 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Nonfunctional controls appear before every HTML5 video when using VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=153089
<rdar://problem/24050668>
Patch by Aaron Chu <aaron_chu@apple.com> on 2016-05-04
Reviewed by Dean Jackson.
Source/WebCore:
Test: media/video-controls-show-on-kb-or-ax-event.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller):
(Controller.prototype.createControls):
(Controller.prototype.updateControls):
(Controller.prototype.handlePlayButtonClicked):
(Controller.prototype.setPlaying):
(Controller.prototype.showShowControlsButton):
(Controller.prototype.showControls):
(Controller.prototype.hideControls):
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.addStartPlaybackControls):
(ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd):
(ControllerIOS.prototype.showControls):
Fix to make sure the showControls button in a media player behaves correctly.
LayoutTests:
* media/video-controls-show-on-kb-or-ax-event-expected.txt:
* media/video-controls-show-on-kb-or-ax-event.html:
A Layout Test to make sure showControls Button in media player is hidden by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolsshowonkboraxeventexpectedtxt">trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolsshowonkboraxeventhtml">trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html</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>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/LayoutTests/ChangeLog 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-04 Aaron Chu <aaron_chu@apple.com>
+
+ AX: Nonfunctional controls appear before every HTML5 video when using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=153089
+ <rdar://problem/24050668>
+
+ Reviewed by Dean Jackson.
+
+ * media/video-controls-show-on-kb-or-ax-event-expected.txt:
+ * media/video-controls-show-on-kb-or-ax-event.html:
+
+ A Layout Test to make sure showControls Button in media player is hidden by default.
+
</ins><span class="cx"> 2016-05-04 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disabling WebGL2 should mean no context is created
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolsshowonkboraxeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><del>-This tests that, after the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the hidden "Show Controls" button.
</del><ins>+This tests:
+1. Initially, toolbar is visible, "Show Controls" button is not.
+2. After the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the invisible "Show Controls" button.
+3. When the video is paused, the controls become visible and the "Show Controls" button is hidden.
</ins><span class="cx">
</span><span class="cx"> PASS
</span><ins>+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
</ins><span class="cx">
</span><del>-
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolsshowonkboraxeventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -1,41 +1,95 @@
</span><del>-<body>
</del><ins>+<body onload="initialChecksBeforePlay()">
</ins><span class="cx"> <p>
</span><del>- This tests that, after the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the hidden "Show Controls" button.
</del><ins>+ This tests:<br>
+ 1. Initially, toolbar is visible, "Show Controls" button is not.<br>
+ 2. After the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the invisible "Show Controls" button.<br>
+ 3. When the video is paused, the controls become visible and the "Show Controls" button is hidden.<br>
</ins><span class="cx"> </p>
</span><ins>+
+<video id="video" controls onplaying="testPlaying()" onpause="testPausing()" src="content/long-test.mp4"></video><br>
+
</ins><span class="cx"> <p id="result">
</span><span class="cx"> FAIL: Test did not run.<br>
</span><span class="cx"> </p>
</span><del>-<video id="video" controls autoplay onplaying="playing()" src="content/long-test.mp4"></video><br>
</del><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function playing() {
</del><ins>+ var result = document.getElementById("result");
+ result.innerHTML = "";
+ // Initially, the showControls Button should be hidden.
+ var root = internals.shadowRoot(document.getElementById("video"));
+ var button = root.firstChild.querySelector('button');
+ var controls = root.firstChild.querySelector('[role="toolbar"]');
+ var video = document.getElementById('video');
</ins><span class="cx">
</span><del>- // Mouse over the video then mouse out to hide controls more quickly.
- eventSender.mouseMoveTo(100,100);
- eventSender.mouseMoveTo(1,1);
</del><ins>+ function isElementHidden(elem) {
+ return (elem.hidden && getComputedStyle(elem).display === 'none')
+ }
+ function initialChecksBeforePlay() {
+ // Before we start, check to make sure toolbar is in place and showControlsbutton is hidden.
+ result.innerHTML += (!isElementHidden(controls))? 'PASS<br>': 'FAIL: Controls are not available at the beginning.<br>';
+ result.innerHTML += (isElementHidden(button))? 'PASS<br>': 'FAIL: "Show Controls" button is not hidden initially.<br>';
</ins><span class="cx">
</span><ins>+ video.play();
+ }
+
+ function testPlaying() {
+ // Make sure we are getting the updated root and button.
+ root = internals.shadowRoot(document.getElementById("video"));
+
+ // We give it a 100ms buffer for the video to set all the properties before sending mouse events.
+ setTimeout(function () {
+ // Mouse over the video then mouse out to hide controls more quickly.
+ eventSender.mouseMoveTo(150,150);
+ eventSender.mouseMoveTo(0,0);
+ }, 100);
+
+ // 300ms after the mouse events, all UI changes should complete and we can start making assertions.
</ins><span class="cx"> setTimeout(function() {
</span><del>- var result = document.getElementById("result");
- result.innerHTML = "";
- var root = internals.shadowRoot(document.getElementById("video"))
-
- var button = root.firstChild.querySelector('button');
- if (button) {
</del><ins>+ // Make sure we are getting the latest copy of the element.
+ controls = root.firstChild.querySelector('[role="toolbar"]');
+ result.innerHTML += !controls? 'PASS<br>': 'FAIL: Toolbar still around after mouseout.<br>';
+
+ // Make sure we are getting the latest copy of the element.
+ button = root.firstChild.querySelector('button');
+ result.innerHTML += !isElementHidden(button)? 'PASS<br>': 'FAIL: Button should be visible.<br>';
+
+ if(button && !isElementHidden(button)) {
</ins><span class="cx"> button.focus();
</span><del>- eventSender.keyDown(' '); // Use keyboard to press the selected button.
- } else
- result.innerHTML += 'FAIL: "Show Controls" button is not available.<br>';
</del><ins>+ eventSender.keyDown(' ');
+ } else
+ result.innerHTML += 'FAIL: "Show Controls" button is hidden or unavailable.<br>';
</ins><span class="cx">
</span><del>- // Verifies the toolbar is back in the DOM.
- var controls = root.firstChild.querySelector('[role="toolbar"]');
- result.innerHTML += controls ? 'PASS': 'FAIL: Test ending, but toolbar is not visible.';
</del><ins>+ // Make sure we are getting the latest copy of the element.
+ controls = root.firstChild.querySelector('[role="toolbar"]');
+ result.innerHTML += controls? 'PASS<br>': 'FAIL: Toolbar should exist<br>';
</ins><span class="cx">
</span><ins>+ eventSender.mouseMoveTo(150,150);
+ eventSender.mouseMoveTo(0,0);
+
+ setTimeout(function () {
+ controls = root.firstChild.querySelector('[role="toolbar"]');
+ result.innerHTML += !controls? 'PASS<br>': 'FAIL: Toolbar should not exist<br>';
+ // We are done testing playing state, moving on to testing the paused state.
+ video.pause();
+ }, 300);
+ }, 400);
+ }
+
+ function testPausing() {
+ // We are giving 100ms + 300s buffer for the video to set its properties and make UI changes.
+ setTimeout(function () {
+ controls = root.firstChild.querySelector('[role="toolbar"]');
+ result.innerHTML += controls? 'PASS<br>': 'FAIL: Toolbar should exist<br>';
+
+ button = root.firstChild.querySelector('button');
+ result.innerHTML += isElementHidden(button)? 'PASS<br>': 'FAIL: Button should not be visible.<br>';
+
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 300) // Wait for video toolbar to hide.
</del><ins>+ }, 400);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-04 Aaron Chu <aaron_chu@apple.com>
+
+ AX: Nonfunctional controls appear before every HTML5 video when using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=153089
+ <rdar://problem/24050668>
+
+ Reviewed by Dean Jackson.
+
+ Test: media/video-controls-show-on-kb-or-ax-event.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller):
+ (Controller.prototype.createControls):
+ (Controller.prototype.updateControls):
+ (Controller.prototype.handlePlayButtonClicked):
+ (Controller.prototype.setPlaying):
+ (Controller.prototype.showShowControlsButton):
+ (Controller.prototype.showControls):
+ (Controller.prototype.hideControls):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.addStartPlaybackControls):
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd):
+ (ControllerIOS.prototype.showControls):
+
+ Fix to make sure the showControls button in a media player behaves correctly.
+
</ins><span class="cx"> 2016-05-04 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disabling WebGL2 should mean no context is created
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> this.isLive = false;
</span><span class="cx"> this.statusHidden = true;
</span><span class="cx"> this.hasWirelessPlaybackTargets = false;
</span><ins>+ this.canToggleShowControlsButton = false;
</ins><span class="cx"> this.isListeningForPlaybackTargetAvailabilityEvent = false;
</span><span class="cx"> this.currentTargetIsWireless = false;
</span><span class="cx"> this.wirelessPlaybackDisabled = false;
</span><span class="lines">@@ -512,7 +513,7 @@
</span><span class="cx"> // Show controls button is an accessibility workaround since the controls are now removed from the DOM. http://webkit.org/b/145684
</span><span class="cx"> var showControlsButton = this.showControlsButton = document.createElement('button');
</span><span class="cx"> showControlsButton.setAttribute('pseudo', '-webkit-media-show-controls');
</span><del>- showControlsButton.hidden = true;
</del><ins>+ this.showShowControlsButton(false);
</ins><span class="cx"> showControlsButton.setAttribute('aria-label', this.UIString('Show Controls'));
</span><span class="cx"> this.listenFor(showControlsButton, 'click', this.handleShowControlsClick);
</span><span class="cx"> this.base.appendChild(showControlsButton);
</span><span class="lines">@@ -647,9 +648,11 @@
</span><span class="cx"> this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> this.resetHideControlsTimer();
</span><ins>+ this.showShowControlsButton(false);
</ins><span class="cx"> } else {
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.add(this.ClassNames.hidden);
</span><ins>+ this.showShowControlsButton(true);
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -987,9 +990,10 @@
</span><span class="cx">
</span><span class="cx"> handlePlayButtonClicked: function(event)
</span><span class="cx"> {
</span><del>- if (this.canPlay())
</del><ins>+ if (this.canPlay()) {
+ this.canToggleShowControlsButton = true;
</ins><span class="cx"> this.video.play();
</span><del>- else
</del><ins>+ } else
</ins><span class="cx"> this.video.pause();
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="lines">@@ -1496,6 +1500,7 @@
</span><span class="cx"> this.controls.playButton.classList.remove(this.ClassNames.paused);
</span><span class="cx"> this.controls.playButton.setAttribute('aria-label', this.UIString('Pause'));
</span><span class="cx"> this.resetHideControlsTimer();
</span><ins>+ this.canToggleShowControlsButton = true;
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1515,6 +1520,12 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ showShowControlsButton: function (shouldShow) {
+ this.showControlsButton.hidden = !shouldShow;
+ if (shouldShow)
+ this.showControlsButton.focus();
+ },
+
</ins><span class="cx"> showControls: function(focusControls)
</span><span class="cx"> {
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</span><span class="lines">@@ -1528,7 +1539,7 @@
</span><span class="cx"> if (focusControls)
</span><span class="cx"> this.controls.playButton.focus();
</span><span class="cx"> }
</span><del>- this.showControlsButton.hidden = true;
</del><ins>+ this.showShowControlsButton(false);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hideControls: function()
</span><span class="lines">@@ -1541,7 +1552,7 @@
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.show);
</span><span class="cx"> if (this.controls.panelBackground)
</span><span class="cx"> this.controls.panelBackground.classList.remove(this.ClassNames.show);
</span><del>- this.showControlsButton.hidden = false;
</del><ins>+ this.showShowControlsButton(this.isPlayable() && this.isPlaying && this.canToggleShowControlsButton);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setNeedsUpdateForDisplayedWidth: function()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (200440 => 200441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2016-05-04 23:41:16 UTC (rev 200440)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2016-05-05 00:05:47 UTC (rev 200441)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx">
</span><span class="cx"> addStartPlaybackControls: function() {
</span><span class="cx"> this.base.appendChild(this.controls.startPlaybackButton);
</span><ins>+ this.showShowControlsButton(false);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> removeStartPlaybackControls: function() {
</span><span class="lines">@@ -441,6 +442,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> this.video.play();
</span><ins>+ this.canToggleShowControlsButton = true;
</ins><span class="cx"> this.updateControls();
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -522,6 +524,7 @@
</span><span class="cx"> if (this.shouldHaveControls() && !this.controls.panelContainer.parentElement) {
</span><span class="cx"> this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
</span><span class="cx"> this.base.appendChild(this.controls.panelContainer);
</span><ins>+ this.showShowControlsButton(false);
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>