<!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>[196119] branches/safari-601.1.46-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/196119">196119</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 08:22:07 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192570">r192570</a>. rdar://problem/24416768</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsBasejs">branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsmediaaccessibilityclosedcaptionshasariaownsexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediaaccessibilityclosedcaptionshasariaownshtml">branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (196118 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-02-04 12:46:12 UTC (rev 196118)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r196094. rdar://problem/24416768
+
+ 2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192570. rdar://problem/24417428
+
+ 2015-11-18 Aaron Chu <arona.chu@gmail.com>
+
+ AX: Shadow DOM video player controls menus need aria-owns on the trigger buttons
+ https://bugs.webkit.org/show_bug.cgi?id=127065
+
+ Reviewed by Darin Adler.
+
+ * media/accessibility-closed-captions-has-aria-owns-expected.txt: Added.
+ * media/accessibility-closed-captions-has-aria-owns.html: Added.
+
</ins><span class="cx"> 2016-01-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195607.
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediaaccessibilityclosedcaptionshasariaownsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns-expected.txt (0 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns-expected.txt 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+Bug 127065: AX: Shadow DOM video player controls menus need aria-owns on the trigger buttons
+
+Does the `aria-owns` on the CC button exist?
+
+PASS captionsButtonARIAOwnsValue is not null
+
+
+
+Did the Audio Track menu show up after the CC button is clicked?
+
+PASS captionsTrackMenuHTMLElement is not null
+
+
+
+Does the `id` of the menu exist?
+
+PASS closedCaptionsTrackMenuIdValue is not null
+
+
+
+Is the `aria-own` on the CC button equal to the `id` on the menu?
+
+PASS captionsButtonARIAOwnsValue is closedCaptionsTrackMenuIdValue
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediaaccessibilityclosedcaptionshasariaownshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns.html (0 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/accessibility-closed-captions-has-aria-owns.html 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../resources/js-test-pre.js"></script>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script src="media-controls.js"></script>
+</head>
+<body>
+ <p> Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=127065">127065</a>: AX: Shadow DOM video player controls menus need aria-owns on the trigger buttons</p>
+ <p id="console"></p>
+ <video id="video" controls width="500">
+ <source src="../media/content/counting.mp4" type="video/mp4">
+ <track src="track/captions-webvtt/captions.vtt" label="English captions" kind="captions" srclang="en-us" default>
+ </video>
+
+ <script>
+ var captionsButtonHTMLElement;
+ var captionsButtonARIAOwnsValue;
+ var captionsTrackMenuHTMLElement;
+ var closedCaptionsTrackMenuIdValue;
+ var video;
+
+ if(!window.testRunner || !window.internals) {
+ failTest();
+ }
+
+ testRunner.dumpAsText();
+
+ start();
+
+ function start()
+ {
+
+ video = document.getElementById('video');
+
+ captionsButtonHTMLElement = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-toggle-closed-captions-button');
+
+ checkForCCButtonARIAOwns();
+
+ captionsButtonHTMLElement.click();
+
+ ensureMenuExist();
+
+ checkForCCTrackMenuId();
+
+ confirmAriaOwnsRelationship();
+
+ testRunner.notifyDone();
+ }
+
+ function log(message)
+ {
+ document.getElementById("console").appendChild(document.createTextNode(message + '\n\n'));
+ }
+
+ function checkForCCButtonARIAOwns()
+ {
+ captionsButtonARIAOwnsValue = captionsButtonHTMLElement.getAttribute('aria-owns');
+ log('Does the `aria-owns` on the CC button exist?');
+ shouldNotBe('captionsButtonARIAOwnsValue', 'null');
+ log('\n');
+ }
+
+ function ensureMenuExist()
+ {
+ captionsTrackMenuHTMLElement = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-closed-captions-container');
+ log('Did the Audio Track menu show up after the CC button is clicked?');
+ shouldNotBe('captionsTrackMenuHTMLElement','null');
+ log('\n');
+ }
+
+ function checkForCCTrackMenuId()
+ {
+ closedCaptionsTrackMenuIdValue = captionsTrackMenuHTMLElement.getAttribute('id');
+ log('Does the `id` of the menu exist?');
+ shouldNotBe('closedCaptionsTrackMenuIdValue', 'null');
+ log('\n');
+ }
+
+ function confirmAriaOwnsRelationship()
+ {
+ log('Is the `aria-own` on the CC button equal to the `id` on the menu?');
+ shouldBe('captionsButtonARIAOwnsValue', 'closedCaptionsTrackMenuIdValue');
+ }
+
+ </script>
+
+ <script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (196118 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-02-04 12:46:12 UTC (rev 196118)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r196094. rdar://problem/24416768
+
+ 2016-02-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192570. rdar://problem/24417428
+
+ 2015-11-18 Aaron Chu <arona.chu@gmail.com>
+
+ AX: Shadow DOM video player controls menus need aria-owns on the trigger buttons
+ https://bugs.webkit.org/show_bug.cgi?id=127065
+
+ Reviewed by Darin Adler.
+
+ Test: media/accessibility-closed-captions-has-aria-owns.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.buildCaptionMenu):
+ * Modules/mediacontrols/mediaControlsBase.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.buildCaptionMenu):
+
</ins><span class="cx"> 2016-01-31 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195932.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (196118 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-02-04 12:46:12 UTC (rev 196118)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -463,6 +463,7 @@
</span><span class="cx"> captionButton.setAttribute('pseudo', '-webkit-media-controls-toggle-closed-captions-button');
</span><span class="cx"> captionButton.setAttribute('aria-label', this.UIString('Captions'));
</span><span class="cx"> captionButton.setAttribute('aria-haspopup', 'true');
</span><ins>+ captionButton.setAttribute('aria-owns', 'audioTrackMenu');
</ins><span class="cx"> this.listenFor(captionButton, 'click', this.handleCaptionButtonClicked);
</span><span class="cx">
</span><span class="cx"> var fullscreenButton = this.controls.fullscreenButton = document.createElement('button');
</span><span class="lines">@@ -1645,6 +1646,7 @@
</span><span class="cx">
</span><span class="cx"> this.captionMenu = document.createElement('div');
</span><span class="cx"> this.captionMenu.setAttribute('pseudo', '-webkit-media-controls-closed-captions-container');
</span><ins>+ this.captionMenu.setAttribute('id', 'audioTrackMenu');
</ins><span class="cx"> this.base.appendChild(this.captionMenu);
</span><span class="cx"> this.captionMenuItems = [];
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsBasejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js (196118 => 196119)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js 2016-02-04 12:46:12 UTC (rev 196118)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js 2016-02-04 16:22:07 UTC (rev 196119)
</span><span class="lines">@@ -396,6 +396,7 @@
</span><span class="cx"> captionButton.setAttribute('pseudo', '-webkit-media-controls-toggle-closed-captions-button');
</span><span class="cx"> captionButton.setAttribute('aria-label', this.UIString('Captions'));
</span><span class="cx"> captionButton.setAttribute('aria-haspopup', 'true');
</span><ins>+ captionButton.setAttribute('aria-owns', 'audioTrackMenu');
</ins><span class="cx"> this.listenFor(captionButton, 'click', this.handleCaptionButtonClicked);
</span><span class="cx">
</span><span class="cx"> var fullscreenButton = this.controls.fullscreenButton = document.createElement('button');
</span><span class="lines">@@ -1129,6 +1130,7 @@
</span><span class="cx">
</span><span class="cx"> this.captionMenu = document.createElement('div');
</span><span class="cx"> this.captionMenu.setAttribute('pseudo', '-webkit-media-controls-closed-captions-container');
</span><ins>+ this.captionMenu.setAttribute('id', 'audioTrackMenu');
</ins><span class="cx"> this.base.appendChild(this.captionMenu);
</span><span class="cx"> this.captionMenuItems = [];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>