<!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>[209506] 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/209506">209506</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 17:37:56 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Remove aspect ratio button
https://bugs.webkit.org/show_bug.cgi?id=165571
Patch by Antoine Quint <graouts@apple.com> on 2016-12-07
Reviewed by Dean Jackson.
Source/WebCore:
Since we do not have a way to toggle letterboxing on an HTMLMediaElement, we remove the
corresponding button in the media controls.
* Modules/modern-media-controls/controls/aspect-ratio-button.js: Removed.
* Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
* Modules/modern-media-controls/js-files:
LayoutTests:
We no longer have an AspectRatioButton.
* media/modern-media-controls/aspect-ratio-button/aspect-ratio-button-expected.txt: Removed.
* media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html: Removed.
* 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-right-container-margin-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:</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="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsrightcontainermarginexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsrightcontainermarginhtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsjsfiles">trunk/Source/WebCore/Modules/modern-media-controls/js-files</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/media/modern-media-controls/aspect-ratio-button/</li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsaspectratiobuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/aspect-ratio-button.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-07 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Remove aspect ratio button
+ https://bugs.webkit.org/show_bug.cgi?id=165571
+
+ Reviewed by Dean Jackson.
+
+ We no longer have an AspectRatioButton.
+
+ * media/modern-media-controls/aspect-ratio-button/aspect-ratio-button-expected.txt: Removed.
+ * media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html: Removed.
+ * 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-right-container-margin-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:
+
</ins><span class="cx"> 2016-12-07 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> One esc to exit fullscreen and pointer lock
</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 (209505 => 209506)</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 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2016-12-08 01:37:56 UTC (rev 209506)
</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 468
</del><ins>+PASS rightContainerBounds.left is within 0.5 of 488
</ins><span class="cx"> PASS rightContainerBounds.top is 500
</span><del>-PASS rightContainerBounds.width is within 0.5 of 166
</del><ins>+PASS rightContainerBounds.width is within 0.5 of 146
</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 (209505 => 209506)</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 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> rightContainerBounds = rightContainer.element.getBoundingClientRect();
</span><del>- shouldBeCloseTo("rightContainerBounds.left", 468, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.left", 488, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.top", "500");
</span><del>- shouldBeCloseTo("rightContainerBounds.width", 166, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.width", 146, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.height", "44");
</span><span class="cx">
</span><span class="cx"> mediaControls.element.remove();
</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 (209505 => 209506)</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 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -23,23 +23,18 @@
</span><span class="cx"> PASS style.webkitMaskPositionY is "13px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><del>-AspectRatioButton
-PASS style.left is "40px"
-PASS style.webkitMaskPositionY is "13px"
-PASS style.height is "44px"
-
</del><span class="cx"> PiPButton
</span><del>-PASS style.left is "72px"
</del><ins>+PASS style.left is "44px"
</ins><span class="cx"> PASS style.webkitMaskPositionY is "13px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><span class="cx"> TracksButton
</span><del>-PASS style.left is "111px"
</del><ins>+PASS style.left is "87px"
</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 "139px"
</del><ins>+PASS style.left is "119px"
</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 (209505 => 209506)</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 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -15,10 +15,9 @@
</span><span class="cx"> [mediaControls.playPauseButton, 78, 12],
</span><span class="cx"> [mediaControls.forwardButton, 127, 16],
</span><span class="cx"> [mediaControls.airplayButton, 12, 13],
</span><del>- [mediaControls.aspectRatioButton, 40, 13],
- [mediaControls.pipButton, 72, 13],
- [mediaControls.tracksButton, 111, 15],
- [mediaControls.fullscreenButton, 139, 13]
</del><ins>+ [mediaControls.pipButton, 44, 13],
+ [mediaControls.tracksButton, 87, 15],
+ [mediaControls.fullscreenButton, 119, 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 (209505 => 209506)</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 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> PASS mediaControls.controlsBar.children[1].margin is 27
</span><span class="cx">
</span><span class="cx"> Right container
</span><del>-PASS mediaControls.controlsBar.children[2].buttons is [mediaControls.airplayButton, mediaControls.aspectRatioButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
</del><ins>+PASS mediaControls.controlsBar.children[2].buttons is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
</ins><span class="cx"> PASS mediaControls.controlsBar.children[2].element.className is "buttons-container right"
</span><span class="cx"> PASS mediaControls.controlsBar.children[2].padding is 12
</span><span class="cx"> PASS mediaControls.controlsBar.children[2].margin is 0
</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 (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Right container");
</span><del>-shouldBe("mediaControls.controlsBar.children[2].buttons", "[mediaControls.airplayButton, mediaControls.aspectRatioButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
</del><ins>+shouldBe("mediaControls.controlsBar.children[2].buttons", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
</ins><span class="cx"> shouldBeEqualToString("mediaControls.controlsBar.children[2].element.className", "buttons-container right");
</span><span class="cx"> shouldBe("mediaControls.controlsBar.children[2].padding", "12");
</span><span class="cx"> shouldBe("mediaControls.controlsBar.children[2].margin", "0");
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsrightcontainermarginexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -3,9 +3,6 @@
</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>-5 enabled buttons
-PASS rightContainer.margin is 12
-
</del><span class="cx"> 4 enabled buttons
</span><span class="cx"> PASS rightContainer.margin is 16
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsrightcontainermarginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -17,21 +17,16 @@
</span><span class="cx"> numberOfFrames++;
</span><span class="cx">
</span><span class="cx"> if (numberOfFrames == 1) {
</span><del>- debug("5 enabled buttons")
- shouldBe("rightContainer.margin", "12");
- debug("");
- mediaControls.airplayButton.enabled = false;
- } else if (numberOfFrames == 2) {
</del><span class="cx"> debug("4 enabled buttons")
</span><span class="cx"> shouldBe("rightContainer.margin", "16");
</span><span class="cx"> debug("");
</span><span class="cx"> mediaControls.tracksButton.enabled = false;
</span><del>- } else if (numberOfFrames == 3) {
</del><ins>+ } else if (numberOfFrames == 2) {
</ins><span class="cx"> debug("3 enabled buttons")
</span><span class="cx"> shouldBe("rightContainer.margin", "24");
</span><span class="cx"> mediaControls.pipButton.enabled = false;
</span><span class="cx"> debug("");
</span><del>- } else if (numberOfFrames == 4) {
</del><ins>+ } else if (numberOfFrames == 3) {
</ins><span class="cx"> debug("2 enabled buttons")
</span><span class="cx"> shouldBe("rightContainer.margin", "24");
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-07 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Remove aspect ratio button
+ https://bugs.webkit.org/show_bug.cgi?id=165571
+
+ Reviewed by Dean Jackson.
+
+ Since we do not have a way to toggle letterboxing on an HTMLMediaElement, we remove the
+ corresponding button in the media controls.
+
+ * Modules/modern-media-controls/controls/aspect-ratio-button.js: Removed.
+ * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
+ * Modules/modern-media-controls/js-files:
+
</ins><span class="cx"> 2016-12-07 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> One esc to exit fullscreen and pointer lock
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsaspectratiobuttonjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/modern-media-controls/controls/aspect-ratio-button.js (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/aspect-ratio-button.js 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/aspect-ratio-button.js 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 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 AspectRatioButton extends IconButton
-{
-
- constructor(layoutDelegate)
- {
- super({
- cssClassName: "aspect-ratio",
- iconName: Icons.ScaleToFill,
- layoutDelegate
- });
- }
-
- // Public
-
- get scalesToFill()
- {
- return this.iconName === Icons.ScaleToFit;
- }
-
- set scalesToFill(flag)
- {
- if (this.scalesToFill === flag)
- return;
-
- this.iconName = flag ? Icons.ScaleToFit : Icons.ScaleToFill;
- }
-
-}
</del></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 (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> // Set up fullscreen-specific buttons.
</span><span class="cx"> this.rewindButton = new RewindButton(this);
</span><del>- this.aspectRatioButton = new AspectRatioButton(this);
</del><span class="cx"> this.forwardButton = new ForwardButton(this);
</span><span class="cx"> this.fullscreenButton.isFullscreen = true;
</span><span class="cx">
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this._rightContainer = new ButtonsContainer({
</span><del>- buttons: [this.airplayButton, this.aspectRatioButton, this.pipButton, this.tracksButton, this.fullscreenButton],
</del><ins>+ buttons: [this.airplayButton, this.pipButton, this.tracksButton, this.fullscreenButton],
</ins><span class="cx"> cssClassName: "right",
</span><span class="cx"> padding: 12
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsjsfiles"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (209505 => 209506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-12-08 01:31:43 UTC (rev 209505)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-12-08 01:37:56 UTC (rev 209506)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> controls/pip-button.js
</span><span class="cx"> controls/tracks-button.js
</span><span class="cx"> controls/fullscreen-button.js
</span><del>-controls/aspect-ratio-button.js
</del><span class="cx"> controls/seek-button.js
</span><span class="cx"> controls/rewind-button.js
</span><span class="cx"> controls/forward-button.js
</span></span></pre>
</div>
</div>
</body>
</html>