<!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>[188225] branches/safari-601.1-branch</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/188225">188225</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-08-10 13:38:50 -0700 (Mon, 10 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188182">r188182</a>. rdar://problem/21254835</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchLayoutTestshttptestscontentextensionstexttrackblockedexpectedtxt">branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsplatformmacmediatracktrackcuerenderinghorizontalexpectedtxt">branches/safari-601.1-branch/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs">branches/safari-601.1-branch/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsmediavideocontrolsshowonkboraxeventexpectedtxt">branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsmediavideocontrolsshowonkboraxeventhtml">branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-08-10 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188182. rdar://problem/21254835
+
+ 2015-08-07 James Craig <jcraig@apple.com>
+
+ REGRESSION(r184722) AX: WebKit video playback toolbar removed from DOM; no longer accessible to VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=145684
+
+ Reviewed by Dean Jackson.
+
+ * http/tests/contentextensions/text-track-blocked-expected.txt: Minor update to test case expectation.
+ * media/video-controls-show-on-kb-or-ax-event-expected.txt: Added.
+ * media/video-controls-show-on-kb-or-ax-event.html: New test validates video controls can be displayed without the need for a mouse.
+ * platform/mac/media/track/track-cue-rendering-horizontal-expected.txt: Minor update to test case expectation.
+
+2015-08-10 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r188190. rdar://problem/22191482
</span><span class="cx">
</span><span class="cx"> 2015-08-08 Commit Queue <commit-queue@webkit.org>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestshttptestscontentextensionstexttrackblockedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -14,3 +14,5 @@
</span><span class="cx"> RenderVideo {VIDEO} at (0,18) size 320x240
</span><span class="cx"> layer at (8,26) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><ins>+layer at (8,256) size 320x10
+ RenderButton {BUTTON} at (0,230) size 320x10 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsmediavideocontrolsshowonkboraxeventexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt (0 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+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.
+
+PASS
+
+
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsmediavideocontrolsshowonkboraxeventhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html (0 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<body>
+<p>
+ 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.
+</p>
+<p id="result">
+ FAIL: Test did not run.<br>
+</p>
+<video id="video" controls autoplay onplaying="playing()" src="content/long-test.mp4"></video><br>
+<script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function playing() {
+
+ // Mouse over the video then mouse out to hide controls more quickly.
+ eventSender.mouseMoveTo(100,100);
+ eventSender.mouseMoveTo(1,1);
+
+ setTimeout(function() {
+ var result = document.getElementById("result");
+ result.innerHTML = "";
+ var root = internals.shadowRoot(document.getElementById("video"))
+
+ var button = root.firstChild.querySelector('button');
+ if (button) {
+ button.focus();
+ eventSender.keyDown(' '); // Use keyboard to press the selected button.
+ } else {
+ result.innerHTML += 'FAIL: "Show Controls" button is not available.<br>';
+ }
+
+ // 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.';
+
+ testRunner.notifyDone();
+ }, 300) // Wait for video toolbar to hide.
+ }
+</script>
+</body>
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsplatformmacmediatracktrackcuerenderinghorizontalexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -60,3 +60,5 @@
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 275x14 [bgcolor=#000000CC]
</span><span class="cx"> RenderText {#text} at (0,0) size 275x14
</span><span class="cx"> text run at (0,0) width 275: "Cue 6: should be on top of bottom positioned cue 5."
</span><ins>+layer at (8,238) size 320x10
+ RenderButton {BUTTON} at (0,230) size 320x10 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-08-10 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188182. rdar://problem/21254835
+
+ 2015-08-07 James Craig <jcraig@apple.com>
+
+ REGRESSION(r184722) AX: WebKit video playback toolbar removed from DOM; no longer accessible to VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=145684
+
+ Reviewed by Dean Jackson.
+
+ Updated Apple Video controls to add an invisible but focusable button that allows VoiceOver
+ users (and when unblocked, keyboard users) to re-display the video controls.
+
+ Test: media/video-controls-show-on-kb-or-ax-event.html
+
+ * English.lproj/mediaControlsLocalizedStrings.js:
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-show-controls):
+ (video::-webkit-media-show-controls):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.handleFullscreenChange):
+ (Controller.prototype.handleShowControlsClick):
+ (Controller.prototype.handleWrapperMouseMove):
+ (Controller.prototype.updateForShowingControls):
+ (Controller.prototype.showControls):
+ (Controller.prototype.hideControls):
+ (Controller.prototype.setNeedsUpdateForDisplayedWidth):
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-show-controls):
+ (video::-webkit-media-show-controls):
+
+2015-08-10 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r188196. rdar://problem/22192773
</span><span class="cx">
</span><span class="cx"> 2015-08-09 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 'Remaining': 'Remaining',
</span><span class="cx"> 'Rewind': 'Rewind',
</span><span class="cx"> 'Rewind ##sec## Seconds': 'Rewind ##sec## Seconds',
</span><ins>+ 'Show Controls': 'Show Controls',
</ins><span class="cx"> 'Stalled': 'Stalled',
</span><span class="cx"> 'Start Playback': 'Start Playback',
</span><span class="cx"> 'Subtitles': 'Subtitles',
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -104,6 +104,22 @@
</span><span class="cx"> opacity: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-show-controls {
+ display: none !important;
+}
+video::-webkit-media-show-controls {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ display: block;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 10px;
+ opacity: 0;
+ -webkit-appearance: none;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-panel-background-container,
</span><span class="cx"> audio::-webkit-media-controls-panel-background-container {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -495,6 +495,14 @@
</span><span class="cx"> wirelessTargetPicker.setAttribute('aria-label', this.UIString('Choose Wireless Display'));
</span><span class="cx"> this.listenFor(wirelessTargetPicker, 'click', this.handleWirelessPickerButtonClicked);
</span><span class="cx">
</span><ins>+ // Show controls button is an accessibility workaround since the controls are now removed from the DOM. http://webkit.org/b/145684
+ var showControlsButton = this.showControlsButton = document.createElement('button');
+ showControlsButton.setAttribute('pseudo', '-webkit-media-show-controls');
+ showControlsButton.hidden = true;
+ showControlsButton.setAttribute('aria-label', this.UIString('Show Controls'));
+ this.listenFor(showControlsButton, 'click', this.handleShowControlsClick);
+ this.base.appendChild(showControlsButton);
+
</ins><span class="cx"> if (!Controller.gSimulateWirelessPlaybackTarget)
</span><span class="cx"> wirelessTargetPicker.classList.add(this.ClassNames.hidden);
</span><span class="cx"> },
</span><span class="lines">@@ -794,6 +802,15 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ handleShowControlsClick: function(event)
+ {
+ if (!this.video.controls && !this.isFullScreen())
+ return;
+
+ if (this.controlsAreHidden())
+ this.showControls(true);
+ },
+
</ins><span class="cx"> handleWrapperMouseMove: function(event)
</span><span class="cx"> {
</span><span class="cx"> if (!this.video.controls && !this.isFullScreen())
</span><span class="lines">@@ -1405,7 +1422,7 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- showControls: function()
</del><ins>+ showControls: function(focusControls)
</ins><span class="cx"> {
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</span><span class="cx"> if (!this.video.controls && !this.isFullScreen())
</span><span class="lines">@@ -1415,7 +1432,10 @@
</span><span class="cx"> if (this.shouldHaveControls() && !this.controls.panel.parentElement) {
</span><span class="cx"> this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
</span><span class="cx"> this.base.appendChild(this.controls.panel);
</span><ins>+ if (focusControls)
+ this.controls.playButton.focus();
</ins><span class="cx"> }
</span><ins>+ this.showControlsButton.hidden = true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hideControls: function()
</span><span class="lines">@@ -1428,6 +1448,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><ins>+ this.showControlsButton.hidden = false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setNeedsUpdateForDisplayedWidth: function()
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (188224 => 188225)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-10 20:38:50 UTC (rev 188225)
</span><span class="lines">@@ -132,6 +132,22 @@
</span><span class="cx"> opacity: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-show-controls {
+ display: none !important;
+}
+video::-webkit-media-show-controls {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ display: block;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 10px;
+ opacity: 0;
+ -webkit-appearance: none;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-panel,
</span><span class="cx"> video::-webkit-media-controls-panel {
</span><span class="cx"> box-sizing: border-box;
</span></span></pre>
</div>
</div>
</body>
</html>