<!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>[211723] 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/211723">211723</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-06 08:16:53 -0800 (Mon, 06 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Bring fullscreen controls up to spec
https://bugs.webkit.org/show_bug.cgi?id=167875
<rdar://problem/29611222>
Patch by Antoine Quint <graouts@apple.com> on 2017-02-06
Reviewed by Eric Carlson.
Source/WebCore:
We update the fullscreen PiP icon to have the correct size and add two new buttons
around the volume slider, "volume-down" to bring the volume to 0 and "volume-up"
to bring the volume to 1.
To accomodate the new volume buttons, we move the volume slider inside an additional
ButtonsContainer object, along with the two new buttons.
Tests: media/modern-media-controls/volume-down-support/volume-down-support.html
media/modern-media-controls/volume-up-support/volume-up-support.html
* Modules/modern-media-controls/controls/icon-service.js:
* Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
(.media-controls.mac.fullscreen button.volume-down):
(.media-controls.mac.fullscreen button.volume-up):
* Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
* Modules/modern-media-controls/controls/volume-down-button.js: Added.
(VolumeDownButton):
* Modules/modern-media-controls/controls/volume-slider.js:
(VolumeSlider):
* Modules/modern-media-controls/controls/volume-up-button.js: Added.
(VolumeUpButton):
* Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png:
* Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png:
* Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png: Added.
* Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png: Added.
* Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png: Added.
* Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png: Added.
* Modules/modern-media-controls/js-files:
* Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype._updateControlsIfNeeded):
* Modules/modern-media-controls/media/volume-down-support.js: Added.
(VolumeDownSupport.prototype.get control):
(VolumeDownSupport.prototype.buttonWasPressed):
(VolumeDownSupport):
* Modules/modern-media-controls/media/volume-up-support.js: Added.
(VolumeUpSupport.prototype.get control):
(VolumeUpSupport.prototype.buttonWasPressed):
(VolumeUpSupport):
* WebCore.xcodeproj/project.pbxproj:
LayoutTests:
Rebaseline some existing tests due to the addition of the volume-down and volume-up
buttons as well as the width change of the PiP icon and add a couple of new tests to
check the behavior of the volume-down and volume-up buttons.
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html:
* media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html:
* media/modern-media-controls/volume-down-support/volume-down-support-expected.txt: Added.
* media/modern-media-controls/volume-down-support/volume-down-support.html: Added.
* media/modern-media-controls/volume-up-support/volume-up-support-expected.txt: Added.
* media/modern-media-controls/volume-up-support/volume-up-support.html: Added.
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstylesexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstyleshtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstylesexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstyleshtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsconstructorexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsconstructorhtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsdraghtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsvolumestylesexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsvolumestyleshtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrhtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs">trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen1xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen2xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsjsfiles">trunk/Source/WebCore/Modules/modern-media-controls/js-files</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs">trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/media/modern-media-controls/volume-down-support/</li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumedownsupportvolumedownsupportexpectedtxt">trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumedownsupportvolumedownsupporthtml">trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support.html</a></li>
<li>trunk/LayoutTests/media/modern-media-controls/volume-up-support/</li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumeupsupportvolumeupsupportexpectedtxt">trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumeupsupportvolumeupsupporthtml">trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support.html</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumedownbuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-down-button.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumeupbuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-up-button.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumedownfullscreen1xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumedownfullscreen2xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumeupfullscreen1xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumeupfullscreen2xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediavolumedownsupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/volume-down-support.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediavolumeupsupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/volume-up-support.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/ChangeLog 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2017-02-06 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Bring fullscreen controls up to spec
+ https://bugs.webkit.org/show_bug.cgi?id=167875
+ <rdar://problem/29611222>
+
+ Reviewed by Eric Carlson.
+
+ Rebaseline some existing tests due to the addition of the volume-down and volume-up
+ buttons as well as the width change of the PiP icon and add a couple of new tests to
+ check the behavior of the volume-down and volume-up buttons.
+
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html:
+ * media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html:
+ * media/modern-media-controls/volume-down-support/volume-down-support-expected.txt: Added.
+ * media/modern-media-controls/volume-down-support/volume-down-support.html: Added.
+ * media/modern-media-controls/volume-up-support/volume-up-support-expected.txt: Added.
+ * media/modern-media-controls/volume-up-support/volume-up-support.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
+2017-02-06 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Improve handling of <video> with only audio tracks
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167836
</span><span class="cx"> <rdar://problem/30255812>
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -8,9 +8,9 @@
</span><span class="cx"> PASS centerContainerBounds.width is 178
</span><span class="cx"> PASS centerContainerBounds.height is 44
</span><span class="cx">
</span><del>-PASS rightContainerBounds.left is within 0.5 of 493
</del><ins>+PASS rightContainerBounds.left is within 0.5 of 496
</ins><span class="cx"> PASS rightContainerBounds.top is 500
</span><del>-PASS rightContainerBounds.width is within 0.5 of 141
</del><ins>+PASS rightContainerBounds.width is within 0.5 of 138
</ins><span class="cx"> PASS rightContainerBounds.height is 44
</span><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstyleshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> rightContainerBounds = rightContainer.element.getBoundingClientRect();
</span><del>- shouldBeCloseTo("rightContainerBounds.left", 493, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.left", 496, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.top", "500");
</span><del>- shouldBeCloseTo("rightContainerBounds.width", 141, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.width", 138, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.height", "44");
</span><span class="cx">
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><span class="cx"> TracksButton
</span><del>-PASS style.left is "82px"
</del><ins>+PASS style.left is "79px"
</ins><span class="cx"> PASS style.webkitMaskPositionY is "15px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><span class="cx"> FullscreenButton
</span><del>-PASS style.left is "114px"
</del><ins>+PASS style.left is "111px"
</ins><span class="cx"> PASS style.webkitMaskPositionY is "13px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstyleshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> [mediaControls.forwardButton, 127, 16],
</span><span class="cx"> [mediaControls.airplayButton, 12, 13],
</span><span class="cx"> [mediaControls.pipButton, 44, 13],
</span><del>- [mediaControls.tracksButton, 82, 15],
- [mediaControls.fullscreenButton, 114, 13]
</del><ins>+ [mediaControls.tracksButton, 79, 15],
+ [mediaControls.fullscreenButton, 111, 13]
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> let style;
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -9,11 +9,18 @@
</span><span class="cx">
</span><span class="cx"> Controls bar
</span><span class="cx"> PASS mediaControls.controlsBar.children.length is 4
</span><del>-PASS mediaControls.controlsBar.children[0] is mediaControls.volumeSlider
</del><ins>+PASS mediaControls.controlsBar.children[0] instanceof ButtonsContainer is true
</ins><span class="cx"> PASS mediaControls.controlsBar.children[1] instanceof ButtonsContainer is true
</span><span class="cx"> PASS mediaControls.controlsBar.children[2] instanceof ButtonsContainer is true
</span><span class="cx"> PASS mediaControls.controlsBar.children[3] is mediaControls.timeControl
</span><span class="cx">
</span><ins>+Left container
+PASS mediaControls.controlsBar.children[0].buttons is [mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]
+PASS mediaControls.controlsBar.children[0].element.className is "buttons-container left"
+PASS mediaControls.controlsBar.children[0].leftMargin is 12
+PASS mediaControls.controlsBar.children[0].rightMargin is 0
+PASS mediaControls.controlsBar.children[0].buttonMargin is 6
+
</ins><span class="cx"> Center container
</span><span class="cx"> PASS mediaControls.controlsBar.children[1].buttons is [mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]
</span><span class="cx"> PASS mediaControls.controlsBar.children[1].element.className is "buttons-container center"
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -14,12 +14,20 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Controls bar");
</span><span class="cx"> shouldBe("mediaControls.controlsBar.children.length", "4");
</span><del>-shouldBe("mediaControls.controlsBar.children[0]", "mediaControls.volumeSlider");
</del><ins>+shouldBeTrue("mediaControls.controlsBar.children[0] instanceof ButtonsContainer");
</ins><span class="cx"> shouldBeTrue("mediaControls.controlsBar.children[1] instanceof ButtonsContainer");
</span><span class="cx"> shouldBeTrue("mediaControls.controlsBar.children[2] instanceof ButtonsContainer");
</span><span class="cx"> shouldBe("mediaControls.controlsBar.children[3]", "mediaControls.timeControl");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><ins>+debug("Left container");
+shouldBe("mediaControls.controlsBar.children[0].buttons", "[mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]");
+shouldBeEqualToString("mediaControls.controlsBar.children[0].element.className", "buttons-container left");
+shouldBe("mediaControls.controlsBar.children[0].leftMargin", "12");
+shouldBe("mediaControls.controlsBar.children[0].rightMargin", "0");
+shouldBe("mediaControls.controlsBar.children[0].buttonMargin", "6");
+
+debug("");
</ins><span class="cx"> debug("Center container");
</span><span class="cx"> shouldBe("mediaControls.controlsBar.children[1].buttons", "[mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]");
</span><span class="cx"> shouldBeEqualToString("mediaControls.controlsBar.children[1].element.className", "buttons-container center");
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsdraghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> mediaControls = shadowRoot.lastChild;
</span><span class="cx"> window.requestAnimationFrame(() => {
</span><span class="cx"> const bounds = mediaControls.querySelector(".controls-bar").getBoundingClientRect();
</span><del>- eventSender.mouseMoveTo(bounds.left + 10, bounds.top + 10);
</del><ins>+ eventSender.mouseMoveTo(bounds.left + 118, bounds.top + 10);
</ins><span class="cx"> eventSender.mouseDown();
</span><del>- eventSender.mouseMoveTo(bounds.left - 40, bounds.top - 90);
</del><ins>+ eventSender.mouseMoveTo(bounds.left + 68, bounds.top - 90);
</ins><span class="cx"> eventSender.mouseUp();
</span><span class="cx">
</span><span class="cx"> window.requestAnimationFrame(() => {
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsvolumestylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS window.getComputedStyle(mediaControls.volumeSlider.element).left is "31px"
</del><ins>+PASS window.getComputedStyle(mediaControls.volumeSlider.element).left is "30px"
</ins><span class="cx"> PASS window.getComputedStyle(mediaControls.volumeSlider.element).top is "23px"
</span><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsvolumestyleshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -9,12 +9,14 @@
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="cx">
</span><span class="cx"> const mediaControls = new MacOSFullscreenMediaControls;
</span><ins>+document.body.appendChild(mediaControls.element);
</ins><span class="cx">
</span><span class="cx"> scheduler.frameDidFire = function()
</span><span class="cx"> {
</span><del>- document.body.appendChild(mediaControls.element);
</del><ins>+ if (!document.body.contains(mediaControls.volumeSlider.element))
+ return;
</ins><span class="cx">
</span><del>- shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).left", "31px");
</del><ins>+ shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).left", "30px");
</ins><span class="cx"> shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).top", "23px");
</span><span class="cx">
</span><span class="cx"> mediaControls.element.remove();
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -17,30 +17,32 @@
</span><span class="cx"> media.addEventListener("webkitfullscreenchange", function() {
</span><span class="cx"> if (media.webkitDisplayingFullscreen) {
</span><span class="cx"> window.requestAnimationFrame(() => {
</span><del>- debug("Media entered fullscreen");
</del><ins>+ window.requestAnimationFrame(() => {
+ debug("Media entered fullscreen");
</ins><span class="cx">
</span><del>- mediaControlsElement = shadowRoot.lastElementChild.lastElementChild;
- volumeSliderElement = mediaControlsElement.querySelector(".volume.slider");
-
- shouldBeTrue("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
- shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "none");
</del><ins>+ mediaControlsElement = shadowRoot.lastElementChild.lastElementChild;
+ volumeSliderElement = mediaControlsElement.querySelector(".volume.slider");
</ins><span class="cx">
</span><del>- debug("");
- debug("Setting layout direction to RTL");
- window.internals.setUserInterfaceLayoutDirection("RTL");
- shouldBeFalse("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
- shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "matrix(-1, 0, 0, 1, 0, 0)");
</del><ins>+ shouldBeTrue("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
+ shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "none");
</ins><span class="cx">
</span><del>- debug("");
- debug("Setting layout direction back to LTR");
- window.internals.setUserInterfaceLayoutDirection("LTR");
- shouldBeTrue("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
- shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "none");
</del><ins>+ debug("");
+ debug("Setting layout direction to RTL");
+ window.internals.setUserInterfaceLayoutDirection("RTL");
+ shouldBeFalse("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
+ shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "matrix(-1, 0, 0, 1, 0, 0)");
</ins><span class="cx">
</span><del>- debug("");
- media.remove();
- button.remove();
- finishJSTest();
</del><ins>+ debug("");
+ debug("Setting layout direction back to LTR");
+ window.internals.setUserInterfaceLayoutDirection("LTR");
+ shouldBeTrue("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
+ shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "none");
+
+ debug("");
+ media.remove();
+ button.remove();
+ finishJSTest();
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumedownsupportvolumedownsupportexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support-expected.txt (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Testing clicking on the volume down button correctly sets the volume to 0.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.volume is 1
+
+Pressing on the volume down button
+PASS media.volume is 0
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumedownsupportvolumedownsupporthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support.html (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/volume-down-support/volume-down-support.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/test.mp4" style="width: 320px; height: 240px;" controls></video>
+<div id="shadow"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing clicking on the volume down button correctly sets the volume to 0.");
+
+const media = document.querySelector("video");
+const button = document.body.appendChild(document.createElement("button"));
+
+media.addEventListener("webkitfullscreenchange", function() {
+ if (media.webkitDisplayingFullscreen) {
+ window.requestAnimationFrame(() => {
+ window.requestAnimationFrame(() => {
+ shouldBe("media.volume", "1");
+
+ media.addEventListener("volumechange", () => {
+ shouldBe("media.volume", "0");
+ debug("");
+ media.remove();
+ button.remove();
+ finishJSTest();
+ });
+
+ debug("");
+ debug("Pressing on the volume down button");
+ pressOnElement(window.internals.shadowRoot(media).lastElementChild.lastElementChild.querySelector("button.volume-down"));
+ });
+ });
+ }
+});
+
+media.addEventListener("loadedmetadata", () => {
+ if (!("eventSender" in window)) {
+ debug("This test is designed to run in DRT");
+ return;
+ }
+
+ // Click a button so we may enter fullscreen.
+ button.addEventListener("click", event => {
+ try {
+ media.webkitEnterFullscreen();
+ } catch(e) {
+ debug("Toggling fullscreen failed");
+ finishJSTest();
+ }
+ });
+
+ pressOnElement(button);
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumeupsupportvolumeupsupportexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support-expected.txt (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support-expected.txt 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Testing clicking on the volume up button correctly sets the volume to 1.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.volume is 0.5
+
+Pressing on the volume up button
+PASS media.volume is 1
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumeupsupportvolumeupsupporthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support.html (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/volume-up-support/volume-up-support.html 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/test.mp4" style="width: 320px; height: 240px;" controls></video>
+<div id="shadow"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing clicking on the volume up button correctly sets the volume to 1.");
+
+const media = document.querySelector("video");
+const button = document.body.appendChild(document.createElement("button"));
+
+media.volume = 0.5;
+
+media.addEventListener("webkitfullscreenchange", function() {
+ if (media.webkitDisplayingFullscreen) {
+ window.requestAnimationFrame(() => {
+ window.requestAnimationFrame(() => {
+ shouldBe("media.volume", "0.5");
+
+ media.addEventListener("volumechange", () => {
+ shouldBe("media.volume", "1");
+ debug("");
+ media.remove();
+ button.remove();
+ finishJSTest();
+ });
+
+ debug("");
+ debug("Pressing on the volume up button");
+ pressOnElement(window.internals.shadowRoot(media).lastElementChild.lastElementChild.querySelector("button.volume-up"));
+ });
+ });
+ }
+});
+
+media.addEventListener("loadedmetadata", () => {
+ if (!("eventSender" in window)) {
+ debug("This test is designed to run in DRT");
+ return;
+ }
+
+ // Click a button so we may enter fullscreen.
+ button.addEventListener("click", event => {
+ try {
+ media.webkitEnterFullscreen();
+ } catch(e) {
+ debug("Toggling fullscreen failed");
+ finishJSTest();
+ }
+ });
+
+ pressOnElement(button);
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -2796,6 +2796,8 @@
</span><span class="cx"> media/modern-media-controls/seek-backward-support [ Skip ]
</span><span class="cx"> media/modern-media-controls/seek-forward-support [ Skip ]
</span><span class="cx"> media/modern-media-controls/start-support/start-support-fullscreen.html [ Skip ]
</span><ins>+media/modern-media-controls/volume-down-support [ Skip ]
+media/modern-media-controls/volume-up-support [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # These tests are mouse-specific
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-auto-hide-mouse-leave-after-play.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/ChangeLog 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2017-02-06 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Bring fullscreen controls up to spec
+ https://bugs.webkit.org/show_bug.cgi?id=167875
+ <rdar://problem/29611222>
+
+ Reviewed by Eric Carlson.
+
+ We update the fullscreen PiP icon to have the correct size and add two new buttons
+ around the volume slider, "volume-down" to bring the volume to 0 and "volume-up"
+ to bring the volume to 1.
+
+ To accomodate the new volume buttons, we move the volume slider inside an additional
+ ButtonsContainer object, along with the two new buttons.
+
+ Tests: media/modern-media-controls/volume-down-support/volume-down-support.html
+ media/modern-media-controls/volume-up-support/volume-up-support.html
+
+ * Modules/modern-media-controls/controls/icon-service.js:
+ * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
+ (.media-controls.mac.fullscreen button.volume-down):
+ (.media-controls.mac.fullscreen button.volume-up):
+ * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
+ * Modules/modern-media-controls/controls/volume-down-button.js: Added.
+ (VolumeDownButton):
+ * Modules/modern-media-controls/controls/volume-slider.js:
+ (VolumeSlider):
+ * Modules/modern-media-controls/controls/volume-up-button.js: Added.
+ (VolumeUpButton):
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png:
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png:
+ * Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png: Added.
+ * Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png: Added.
+ * Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png: Added.
+ * Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png: Added.
+ * Modules/modern-media-controls/js-files:
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController.prototype._updateControlsIfNeeded):
+ * Modules/modern-media-controls/media/volume-down-support.js: Added.
+ (VolumeDownSupport.prototype.get control):
+ (VolumeDownSupport.prototype.buttonWasPressed):
+ (VolumeDownSupport):
+ * Modules/modern-media-controls/media/volume-up-support.js: Added.
+ (VolumeUpSupport.prototype.get control):
+ (VolumeUpSupport.prototype.buttonWasPressed):
+ (VolumeUpSupport):
+ * WebCore.xcodeproj/project.pbxproj:
+
+2017-02-06 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Improve handling of <video> with only audio tracks
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167836
</span><span class="cx"> <rdar://problem/30255812>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -41,10 +41,12 @@
</span><span class="cx"> Start : "start",
</span><span class="cx"> Tracks : "media-selection",
</span><span class="cx"> Volume : "volume",
</span><del>- VolumeMuted : "volume-mute"
</del><ins>+ VolumeDown : "volume-down",
+ VolumeMuted : "volume-mute",
+ VolumeUp : "volume-up"
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.EnterPiP, Icons.Play];
</del><ins>+const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.EnterPiP, Icons.Play, Icons.VolumeDown, Icons.VolumeUp];
</ins><span class="cx"> const IconsWithCompactVariants = [Icons.Play, Icons.Pause, Icons.SkipBack, Icons.Volume, Icons.VolumeMuted, Icons.EnterFullscreen];
</span><span class="cx">
</span><span class="cx"> const iconService = new class IconService {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -57,6 +57,14 @@
</span><span class="cx"> transform: scaleX(-1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-controls.mac.fullscreen button.volume-down {
+ -webkit-mask-position-y: 18px;
+}
+
+.media-controls.mac.fullscreen button.volume-up {
+ -webkit-mask-position-y: 18px;
+}
+
</ins><span class="cx"> /* Button containers */
</span><span class="cx">
</span><span class="cx"> .media-controls.mac.fullscreen .buttons-container {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> this.element.classList.add("fullscreen");
</span><span class="cx">
</span><span class="cx"> // Set up fullscreen-specific buttons.
</span><ins>+ this.volumeDownButton = new VolumeDownButton(this);
+ this.volumeUpButton = new VolumeUpButton(this);
</ins><span class="cx"> this.rewindButton = new RewindButton(this);
</span><span class="cx"> this.forwardButton = new ForwardButton(this);
</span><span class="cx"> this.fullscreenButton.isFullscreen = true;
</span><span class="lines">@@ -46,6 +48,14 @@
</span><span class="cx">
</span><span class="cx"> this.volumeSlider.width = 60;
</span><span class="cx">
</span><ins>+ this._leftContainer = new ButtonsContainer({
+ buttons: [this.volumeDownButton, this.volumeSlider, this.volumeUpButton],
+ cssClassName: "left",
+ leftMargin: 12,
+ rightMargin: 0,
+ buttonMargin: 6
+ });
+
</ins><span class="cx"> this._centerContainer = new ButtonsContainer({
</span><span class="cx"> buttons: [this.rewindButton, this.playPauseButton, this.forwardButton],
</span><span class="cx"> cssClassName: "center",
</span><span class="lines">@@ -61,7 +71,7 @@
</span><span class="cx"> rightMargin: 12
</span><span class="cx"> });
</span><span class="cx">
</span><del>- this.controlsBar.children = [this.volumeSlider, this._centerContainer, this._rightContainer, this.timeControl];
</del><ins>+ this.controlsBar.children = [this._leftContainer, this._centerContainer, this._rightContainer, this.timeControl];
</ins><span class="cx">
</span><span class="cx"> this.element.addEventListener("mousedown", this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumedownbuttonjsfromrev211722trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-down-button.js (from rev 211722, trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js) (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-down-button.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-down-button.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class VolumeDownButton extends IconButton
+{
+
+ constructor(layoutDelegate)
+ {
+ super({
+ cssClassName: "volume-down",
+ iconName: Icons.VolumeDown,
+ layoutDelegate
+ });
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> constructor()
</span><span class="cx"> {
</span><span class="cx"> super("volume");
</span><ins>+ this.enabled = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumeupbuttonjsfromrev211722trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-up-button.js (from rev 211722, trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js) (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-up-button.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-up-button.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class VolumeUpButton extends IconButton
+{
+
+ constructor(layoutDelegate)
+ {
+ super({
+ cssClassName: "volume-up",
+ iconName: Icons.VolumeUp,
+ layoutDelegate
+ });
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen1xpng"></a>
<div class="binary"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen2xpng"></a>
<div class="binary"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumedownfullscreen1xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png 2017-02-06 13:48:10 UTC (rev 211722)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png 2017-02-06 16:16:53 UTC (rev 211723)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@1x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumedownfullscreen2xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png 2017-02-06 13:48:10 UTC (rev 211722)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png 2017-02-06 16:16:53 UTC (rev 211723)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-down-fullscreen@2x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumeupfullscreen1xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png 2017-02-06 13:48:10 UTC (rev 211722)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png 2017-02-06 16:16:53 UTC (rev 211723)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@1x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSvolumeupfullscreen2xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png 2017-02-06 13:48:10 UTC (rev 211722)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png 2017-02-06 16:16:53 UTC (rev 211723)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/volume-up-fullscreen@2x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreModulesmodernmediacontrolsjsfiles"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> controls/seek-button.js
</span><span class="cx"> controls/rewind-button.js
</span><span class="cx"> controls/forward-button.js
</span><ins>+controls/volume-down-button.js
+controls/volume-up-button.js
</ins><span class="cx"> controls/buttons-container.js
</span><span class="cx"> controls/status-label.js
</span><span class="cx"> controls/controls-bar.js
</span><span class="lines">@@ -55,6 +57,8 @@
</span><span class="cx"> media/start-support.js
</span><span class="cx"> media/status-support.js
</span><span class="cx"> media/tracks-support.js
</span><ins>+media/volume-down-support.js
</ins><span class="cx"> media/volume-support.js
</span><ins>+media/volume-up-support.js
</ins><span class="cx"> media/media-controller.js
</span><span class="cx"> main.js
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> this._updateControlsSize();
</span><span class="cx">
</span><del>- this._supportingObjects = [AirplaySupport, ControlsVisibilitySupport, ElapsedTimeSupport, FullscreenSupport, MuteSupport, PiPSupport, PlacardSupport, PlaybackSupport, RemainingTimeSupport, ScrubbingSupport, SeekBackwardSupport, SeekForwardSupport, SkipBackSupport, StartSupport, StatusSupport, TracksSupport, VolumeSupport].map(SupportClass => {
</del><ins>+ this._supportingObjects = [AirplaySupport, ControlsVisibilitySupport, ElapsedTimeSupport, FullscreenSupport, MuteSupport, PiPSupport, PlacardSupport, PlaybackSupport, RemainingTimeSupport, ScrubbingSupport, SeekBackwardSupport, SeekForwardSupport, SkipBackSupport, StartSupport, StatusSupport, TracksSupport, VolumeSupport, VolumeDownSupport, VolumeUpSupport].map(SupportClass => {
</ins><span class="cx"> return new SupportClass(this);
</span><span class="cx"> }, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediavolumedownsupportjsfromrev211722trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/modern-media-controls/media/volume-down-support.js (from rev 211722, trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js) (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/volume-down-support.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/volume-down-support.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class VolumeDownSupport extends MediaControllerSupport
+{
+
+ // Protected
+
+ get control()
+ {
+ return this.mediaController.controls.volumeDownButton;
+ }
+
+ buttonWasPressed(control)
+ {
+ this.mediaController.media.volume = 0;
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediavolumeupsupportjsfromrev211722trunkSourceWebCoreModulesmodernmediacontrolscontrolsvolumesliderjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/modern-media-controls/media/volume-up-support.js (from rev 211722, trunk/Source/WebCore/Modules/modern-media-controls/controls/volume-slider.js) (0 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/volume-up-support.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/volume-up-support.js 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class VolumeUpSupport extends MediaControllerSupport
+{
+
+ // Protected
+
+ get control()
+ {
+ return this.mediaController.controls.volumeUpButton;
+ }
+
+ buttonWasPressed(control)
+ {
+ this.mediaController.media.volume = 1;
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (211722 => 211723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-06 13:48:10 UTC (rev 211722)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-06 16:16:53 UTC (rev 211723)
</span><span class="lines">@@ -10110,6 +10110,14 @@
</span><span class="cx"> 715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; };
</span><span class="cx"> 7157E3D11DC1EE4B0094550E /* scrubbing-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "scrubbing-support.js"; sourceTree = "<group>"; };
</span><span class="cx"> 7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTransformList.cpp; sourceTree = "<group>"; };
</span><ins>+ 716C8DF11E48B269005BD0DA /* volume-down-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-down-support.js"; sourceTree = "<group>"; };
+ 716C8DF21E48B269005BD0DA /* volume-up-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-up-support.js"; sourceTree = "<group>"; };
+ 716C8DF31E48B284005BD0DA /* volume-down-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-down-button.js"; sourceTree = "<group>"; };
+ 716C8DF41E48B284005BD0DA /* volume-up-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-up-button.js"; sourceTree = "<group>"; };
+ 716C8DF51E48B2B5005BD0DA /* volume-down-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-down-fullscreen@1x.png"; sourceTree = "<group>"; };
+ 716C8DF61E48B2B5005BD0DA /* volume-down-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-down-fullscreen@2x.png"; sourceTree = "<group>"; };
+ 716C8DF71E48B2B5005BD0DA /* volume-up-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-up-fullscreen@1x.png"; sourceTree = "<group>"; };
+ 716C8DF81E48B2B5005BD0DA /* volume-up-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-up-fullscreen@2x.png"; sourceTree = "<group>"; };
</ins><span class="cx"> 716FA0D81DB26591007323CC /* airplay-button.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "airplay-button.css"; sourceTree = "<group>"; };
</span><span class="cx"> 716FA0D91DB26591007323CC /* airplay-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-button.js"; sourceTree = "<group>"; };
</span><span class="cx"> 716FA0DA1DB26591007323CC /* airplay-placard.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-placard.js"; sourceTree = "<group>"; };
</span><span class="lines">@@ -18394,8 +18402,10 @@
</span><span class="cx"> 716FA0FE1DB26591007323CC /* tracks-button.js */,
</span><span class="cx"> 7146DF8B1DEFC2ED0046F98B /* tracks-panel.css */,
</span><span class="cx"> 7146DF8C1DEFC2ED0046F98B /* tracks-panel.js */,
</span><ins>+ 716C8DF31E48B284005BD0DA /* volume-down-button.js */,
</ins><span class="cx"> 716FA0FF1DB26591007323CC /* volume-slider.css */,
</span><span class="cx"> 716FA1001DB26591007323CC /* volume-slider.js */,
</span><ins>+ 716C8DF41E48B284005BD0DA /* volume-up-button.js */,
</ins><span class="cx"> );
</span><span class="cx"> name = controls;
</span><span class="cx"> path = "Modules/modern-media-controls/controls";
</span><span class="lines">@@ -18423,7 +18433,9 @@
</span><span class="cx"> 7177E2481DB80D2F00919A0B /* start-support.js */,
</span><span class="cx"> 71B0460A1DD3C2EE00EE19CF /* status-support.js */,
</span><span class="cx"> 71F936F71DD4F99B00922CC7 /* tracks-support.js */,
</span><ins>+ 716C8DF11E48B269005BD0DA /* volume-down-support.js */,
</ins><span class="cx"> 717F90571DC40ED60006F520 /* volume-support.js */,
</span><ins>+ 716C8DF21E48B269005BD0DA /* volume-up-support.js */,
</ins><span class="cx"> );
</span><span class="cx"> path = media;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -18541,8 +18553,12 @@
</span><span class="cx"> 71D6AABD1DA4EAF700B23969 /* start@2x.png */,
</span><span class="cx"> 717F61991E43D66500F37024 /* volume-compact@1x.png */,
</span><span class="cx"> 717F619A1E43D66500F37024 /* volume-compact@2x.png */,
</span><ins>+ 716C8DF51E48B2B5005BD0DA /* volume-down-fullscreen@1x.png */,
+ 716C8DF61E48B2B5005BD0DA /* volume-down-fullscreen@2x.png */,
</ins><span class="cx"> 71D6AABE1DA4EAF700B23969 /* volume-mute@1x.png */,
</span><span class="cx"> 71D6AABF1DA4EAF700B23969 /* volume-mute@2x.png */,
</span><ins>+ 716C8DF71E48B2B5005BD0DA /* volume-up-fullscreen@1x.png */,
+ 716C8DF81E48B2B5005BD0DA /* volume-up-fullscreen@2x.png */,
</ins><span class="cx"> 71D6AAC01DA4EAF700B23969 /* volume@1x.png */,
</span><span class="cx"> 71D6AAC11DA4EAF700B23969 /* volume@2x.png */,
</span><span class="cx"> );
</span></span></pre>
</div>
</div>
</body>
</html>