<!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>[203866] branches/safari-602-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/203866">203866</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:11:26 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203669">r203669</a>. rdar://problem/27285070</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-602-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsaccessibilitymacvideovolumeslideraccessibilityexpectedtxt">branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsaccessibilitymacvideovolumeslideraccessibilityhtml">branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (203865 => 203866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:11:23 UTC (rev 203865)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:11:26 UTC (rev 203866)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203669. rdar://problem/27285070
+
+ 2016-07-24 Nan Wang <n_wang@apple.com>
+
+ AX: Video Controls: Volume cannot be adjusted using VO.
+ https://bugs.webkit.org/show_bug.cgi?id=160107
+
+ Reviewed by Dean Jackson.
+
+ * accessibility/mac/video-volume-slider-accessibility-expected.txt: Added.
+ * accessibility/mac/video-volume-slider-accessibility.html: Added.
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203667. rdar://problem/27506489
</span><span class="cx">
</span><span class="cx"> 2016-07-24 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilitymacvideovolumeslideraccessibilityexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility-expected.txt (0 => 203866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility-expected.txt 2016-07-29 07:11:26 UTC (rev 203866)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+This tests that video tag's volume slider has percentage value description and 0.05 step.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS slider.valueDescription is 'AXValueDescription: 100%'
+PASS slider.intValue.toFixed(2) is '0.95'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilitymacvideovolumeslideraccessibilityhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility.html (0 => 203866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/accessibility/mac/video-volume-slider-accessibility.html 2016-07-29 07:11:26 UTC (rev 203866)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+div.absolute {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 400px;
+ height: 200px;
+ border: 1px solid #73AD21;
+}
+</style>
+</head>
+
+<body id="body">
+
+<div class="absolute" id="container" tabindex=0 id="region" title="region">
+<video id="video" width="400" height="200" controls>
+ <source src="" type="video/mp4">
+ Test Video.
+</video>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that video tag's volume slider has percentage value description and 0.05 step.");
+
+ if (window.accessibilityController) {
+
+ var video = accessibilityController.accessibleElementById("container").childAtIndex(0);
+ var slider = video.childAtIndex(0).childAtIndex(6);
+
+ // First make sure the value description is in percentage.
+ shouldBe("slider.valueDescription", "'AXValueDescription: 100%'");
+
+ // Then decrement the slider and check the step is 0.05.
+ slider.decrement();
+ shouldBe("slider.intValue.toFixed(2)", "'0.95'");
+}
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203865 => 203866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:11:23 UTC (rev 203865)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:11:26 UTC (rev 203866)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203669. rdar://problem/27285070
+
+ 2016-07-24 Nan Wang <n_wang@apple.com>
+
+ AX: Video Controls: Volume cannot be adjusted using VO.
+ https://bugs.webkit.org/show_bug.cgi?id=160107
+
+ Reviewed by Dean Jackson.
+
+ The volume slider in video tag had 0.01 step which caused the screen reader adjusting it slowly.
+ Changed the step to 0.05 and added the aria-valuetext attribute to the slider, so that the value
+ is spoken in percentage.
+
+ Test: accessibility/mac/video-volume-slider-accessibility.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.handleVolumeSliderInput):
+ (Controller.prototype.updateVolume):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203667. rdar://problem/27506489
</span><span class="cx">
</span><span class="cx"> 2016-07-24 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (203865 => 203866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-07-29 07:11:23 UTC (rev 203865)
+++ branches/safari-602-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-07-29 07:11:26 UTC (rev 203866)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> volume.type = 'range';
</span><span class="cx"> volume.min = 0;
</span><span class="cx"> volume.max = 1;
</span><del>- volume.step = .01;
</del><ins>+ volume.step = .05;
</ins><span class="cx"> this.listenFor(volume, 'input', this.handleVolumeSliderInput);
</span><span class="cx"> this.listenFor(volume, 'mousedown', this.handleVolumeSliderMouseDown);
</span><span class="cx"> this.listenFor(volume, 'mouseup', this.handleVolumeSliderMouseUp);
</span><span class="lines">@@ -1163,6 +1163,7 @@
</span><span class="cx"> this.controls.muteButton.setAttribute('aria-label', this.UIString('Mute'));
</span><span class="cx"> }
</span><span class="cx"> this.video.volume = this.controls.volume.value;
</span><ins>+ this.controls.volume.setAttribute('aria-valuetext', this.controls.volume.value * 100 + '%');
</ins><span class="cx"> this.drawVolumeBackground();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -2083,6 +2084,7 @@
</span><span class="cx"> this.controls.muteButton.classList.remove(this.ClassNames.muted);
</span><span class="cx"> this.controls.volume.value = this.video.volume;
</span><span class="cx"> }
</span><ins>+ this.controls.volume.setAttribute('aria-valuetext', this.controls.volume.value * 100 + '%');
</ins><span class="cx"> this.drawVolumeBackground();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>