<!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>[209170] 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/209170">209170</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 19:20:30 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Add support for right-to-left layouts
https://bugs.webkit.org/show_bug.cgi?id=165229
Patch by Antoine Quint <graouts@apple.com> on 2016-11-30
Reviewed by Dean Jackson.
Source/WebCore:
We implement the "usesLTRUserInterfaceLayoutDirection" property which is set by HTMLMediaElement
and set a CSS class when the layout is left-to-right, flipping the fullscreen volume slider in the
case that it would not be present (right-to-left).
Test: media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html
* Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
(.media-controls.mac.fullscreen:not(.uses-ltr-user-interface-layout-direction) .volume.slider):
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.prototype.get usesLTRUserInterfaceLayoutDirection):
(MediaControls.prototype.set usesLTRUserInterfaceLayoutDirection):
* Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype.set usesLTRUserInterfaceLayoutDirection):
(MediaController.prototype._updateControlsIfNeeded):
LayoutTests:
Add a test that toggles the layout direction and checks we correctly flip the volume slider.
* media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt: Added.
* media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html: Added.
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs">trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrhtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-11-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Add support for right-to-left layouts
+ https://bugs.webkit.org/show_bug.cgi?id=165229
+
+ Reviewed by Dean Jackson.
+
+ Add a test that toggles the layout direction and checks we correctly flip the volume slider.
+
+ * media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt: Added.
+ * media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2016-11-30 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] LayoutNode: only mark properties as dirty if different than current value
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165236
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt (0 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr-expected.txt 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Testing ltr is set correctly when entering fullscreen.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media entered fullscreen
+PASS mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction') is true
+PASS document.defaultView.getComputedStyle(volumeSliderElement).transform is "none"
+
+Setting layout direction to RTL
+PASS mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction') is false
+PASS document.defaultView.getComputedStyle(volumeSliderElement).transform is "matrix(-1, 0, 0, 1, 0, 0)"
+
+Setting layout direction back to LTR
+PASS mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction') is true
+PASS document.defaultView.getComputedStyle(volumeSliderElement).transform is "none"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfullscreenltrhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html (0 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=true ] -->
+<script src="../../../resources/js-test-pre.js"></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 ltr is set correctly when entering fullscreen.");
+
+const media = document.querySelector("video");
+const button = document.body.appendChild(document.createElement("button"));
+let shadowRoot = window.internals.shadowRoot(media);
+let mediaControlsElement, volumeSliderElement;
+
+media.addEventListener("webkitfullscreenchange", function() {
+ if (media.webkitDisplayingFullscreen) {
+ window.requestAnimationFrame(() => {
+ debug("Media entered fullscreen");
+
+ mediaControlsElement = shadowRoot.lastChild;
+ volumeSliderElement = mediaControlsElement.querySelector(".volume.slider");
+
+ shouldBeTrue("mediaControlsElement.classList.contains('uses-ltr-user-interface-layout-direction')");
+ shouldBeEqualToString("document.defaultView.getComputedStyle(volumeSliderElement).transform", "none");
+
+ 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)");
+
+ 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();
+ });
+ }
+});
+
+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();
+ }
+ });
+
+ eventSender.mouseMoveTo(button.offsetLeft + 1, button.offsetTop + 1);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+});
+
+</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 (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -2747,8 +2747,9 @@
</span><span class="cx"> media/modern-media-controls/placard-support [ Skip ]
</span><span class="cx"> media/modern-media-controls/audio [ Skip ]
</span><span class="cx">
</span><del>-# This test is Mac-specific since it checks that we have custom controls in fullscreen.
</del><ins>+# Mac-specific tests for fullscreen.
</ins><span class="cx"> media/modern-media-controls/media-controller/media-controller-fullscreen-change.html [ Skip ]
</span><ins>+media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/164594 http/tests/cache/disk-cache/disk-cache-request-headers.html [ Pass Timeout ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -1451,6 +1451,7 @@
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/pip-support [ Skip ]
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/placard-support [ Skip ]
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/audio [ Skip ]
</span><ins>+[ Yosemite ] media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/164616 http/tests/media/modern-media-controls/skip-back-support/skip-back-support-button-click.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/164323 media/modern-media-controls/airplay-support/airplay-support.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-11-30 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Add support for right-to-left layouts
+ https://bugs.webkit.org/show_bug.cgi?id=165229
+
+ Reviewed by Dean Jackson.
+
+ We implement the "usesLTRUserInterfaceLayoutDirection" property which is set by HTMLMediaElement
+ and set a CSS class when the layout is left-to-right, flipping the fullscreen volume slider in the
+ case that it would not be present (right-to-left).
+
+ Test: media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html
+
+ * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
+ (.media-controls.mac.fullscreen:not(.uses-ltr-user-interface-layout-direction) .volume.slider):
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.prototype.get usesLTRUserInterfaceLayoutDirection):
+ (MediaControls.prototype.set usesLTRUserInterfaceLayoutDirection):
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController.prototype.set usesLTRUserInterfaceLayoutDirection):
+ (MediaController.prototype._updateControlsIfNeeded):
+
</ins><span class="cx"> 2016-11-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused parameter of InspectorInstrumentation::didFinishXHRLoading
</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 (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -46,6 +46,10 @@
</span><span class="cx"> top: 23px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-controls.mac.fullscreen:not(.uses-ltr-user-interface-layout-direction) .volume.slider {
+ transform: scaleX(-1);
+}
+
</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="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -70,6 +70,16 @@
</span><span class="cx"> this._invalidateChildren();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get usesLTRUserInterfaceLayoutDirection()
+ {
+ return this.element.classList.contains("uses-ltr-user-interface-layout-direction");
+ }
+
+ set usesLTRUserInterfaceLayoutDirection(flag)
+ {
+ this.element.classList.toggle("uses-ltr-user-interface-layout-direction", flag);
+ }
+
</ins><span class="cx"> get showsPlacard()
</span><span class="cx"> {
</span><span class="cx"> return this.children[0] instanceof Placard;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (209169 => 209170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-12-01 03:16:13 UTC (rev 209169)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-12-01 03:20:30 UTC (rev 209170)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> set usesLTRUserInterfaceLayoutDirection(flag)
</span><span class="cx"> {
</span><del>- // FIXME: To be implemented.
</del><ins>+ this.controls.usesLTRUserInterfaceLayoutDirection = flag;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> handleEvent(event)
</span><span class="lines">@@ -98,9 +98,10 @@
</span><span class="cx">
</span><span class="cx"> this.controls = new ControlsClass;
</span><span class="cx">
</span><del>- if (previousControls)
</del><ins>+ if (previousControls) {
</ins><span class="cx"> this.shadowRoot.replaceChild(this.controls.element, previousControls.element);
</span><del>- else
</del><ins>+ this.controls.usesLTRUserInterfaceLayoutDirection = previousControls.usesLTRUserInterfaceLayoutDirection;
+ } else
</ins><span class="cx"> this.shadowRoot.appendChild(this.controls.element);
</span><span class="cx">
</span><span class="cx"> this._updateControlsSize();
</span></span></pre>
</div>
</div>
</body>
</html>