<!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>[213994] 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/213994">213994</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 11:21:18 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Tracks menu overlaps controls bar in fullscreen
https://bugs.webkit.org/show_bug.cgi?id=169670
<rdar://problem/31060086>
Source/WebCore:
Patch by Antoine Quint <graouts@apple.com> on 2017-03-15
Reviewed by Eric Carlson.
It used to be that the top of the tracks button was the same as the top of the controls
bar, but that changed when we fixed https://bugs.webkit.org/show_bug.cgi?id=169412. We
now use the top of the controls bar to computed the y-position for the tracks panel.
We are not adding a new test, instead we're unflaking a test that started failing
reliably once we fixed https://bugs.webkit.org/show_bug.cgi?id=169412.
* Modules/modern-media-controls/controls/macos-media-controls.js:
(MacOSMediaControls.prototype.showTracksPanel):
LayoutTests:
Patch by Antoine Quint <graouts@apple.com> on 2017-03-15
Reviewed by Eric Carlson.
Unflake a test that checks the tracks panel position in fullscreen.
* media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt:
* media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelfullscreenexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelfullscreenhtml">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html</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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-03-15 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Tracks menu overlaps controls bar in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=169670
+ <rdar://problem/31060086>
+
+ Reviewed by Eric Carlson.
+
+ Unflake a test that checks the tracks panel position in fullscreen.
+
+ * media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt:
+ * media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html:
+ * platform/mac/TestExpectations:
+
+2017-03-15 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Captions do not default to Auto when language is changed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169675
</span><span class="cx"> <rdar://problem/30423369>
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelfullscreenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen-expected.txt 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -3,8 +3,14 @@
</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 shadowRoot.querySelector('.tracks-panel').style.right is "217px"
-PASS shadowRoot.querySelector('.tracks-panel').style.bottom is "101px"
</del><ins>+PASS internals.shadowRoot(media).querySelector("button.fullscreen") became different from null
+PASS internals.shadowRoot(media).querySelector("button.fullscreen").getBoundingClientRect().width became different from 0
+PASS internals.shadowRoot(media).querySelector("button.tracks") became different from null
+PASS internals.shadowRoot(media).querySelector("button.tracks").getBoundingClientRect().width became different from 0
+PASS internals.shadowRoot(media).querySelector("button.tracks").getBoundingClientRect().right became 583
+PASS internals.shadowRoot(media).querySelector('.tracks-panel') became different from null
+PASS internals.shadowRoot(media).querySelector('.tracks-panel').style.right is "217px"
+PASS internals.shadowRoot(media).querySelector('.tracks-panel').style.bottom is "101px"
</ins><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelfullscreenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><ins>+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
</ins><span class="cx"> <body>
</span><span class="cx"> <video src="../../content/CC+Subtitles.mov" style="width: 320px; height: 240px;" controls autoplay></video>
</span><span class="cx"> <script type="text/javascript">
</span><span class="lines">@@ -9,21 +10,18 @@
</span><span class="cx"> description("Showing the tracks panel in fullscreen.");
</span><span class="cx">
</span><span class="cx"> const media = document.querySelector("video");
</span><del>-const shadowRoot = window.internals.shadowRoot(media);
</del><span class="cx">
</span><del>-media.addEventListener("webkitbeginfullscreen", () => {
- debug("webkitbeginfullscreen");
-});
-
</del><span class="cx"> media.addEventListener("webkitfullscreenchange", () => {
</span><del>- if (media.webkitDisplayingFullscreen) {
- window.requestAnimationFrame(() => {
- clickOnButton("tracks");
- window.requestAnimationFrame(() => {
- window.requestAnimationFrame(() => {
- shouldBeEqualToString("shadowRoot.querySelector('.tracks-panel').style.right", "217px");
- shouldBeEqualToString("shadowRoot.querySelector('.tracks-panel').style.bottom", "101px");
</del><ins>+ if (!media.webkitDisplayingFullscreen)
+ return;
</ins><span class="cx">
</span><ins>+ shouldBecomeDifferent(`internals.shadowRoot(media).querySelector("button.tracks")`, "null", () => {
+ shouldBecomeDifferent(`internals.shadowRoot(media).querySelector("button.tracks").getBoundingClientRect().width`, "0", () => {
+ shouldBecomeEqual(`internals.shadowRoot(media).querySelector("button.tracks").getBoundingClientRect().right`, "583", () => {
+ pressOnElement(internals.shadowRoot(media).querySelector("button.tracks"));
+ shouldBecomeDifferent(`internals.shadowRoot(media).querySelector('.tracks-panel')`, "null", () => {
+ shouldBeEqualToString("internals.shadowRoot(media).querySelector('.tracks-panel').style.right", "217px");
+ shouldBeEqualToString("internals.shadowRoot(media).querySelector('.tracks-panel').style.bottom", "101px");
</ins><span class="cx"> debug("");
</span><span class="cx"> media.remove();
</span><span class="cx"> finishJSTest();
</span><span class="lines">@@ -30,22 +28,18 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><del>- }
</del><ins>+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> media.addEventListener("play", () => {
</span><span class="cx"> media.pause();
</span><del>- window.requestAnimationFrame(() => clickOnButton("fullscreen"));
</del><ins>+ shouldBecomeDifferent(`internals.shadowRoot(media).querySelector("button.fullscreen")`, "null", () => {
+ shouldBecomeDifferent(`internals.shadowRoot(media).querySelector("button.fullscreen").getBoundingClientRect().width`, "0", () => {
+ pressOnElement(internals.shadowRoot(media).querySelector(`button.fullscreen`));
+ });
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><del>-function clickOnButton(name)
-{
- const bounds = shadowRoot.querySelector(`button.${name}`).getBoundingClientRect();
- eventSender.mouseMoveTo(bounds.left + 1, bounds.top + 1);
- eventSender.mouseDown();
- eventSender.mouseUp();
-}
-
</del><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -1488,7 +1488,6 @@
</span><span class="cx"> webkit.org/b/165386 media/modern-media-controls/seek-backward-support/seek-backward-support.html [ Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/169158 media/modern-media-controls/tracks-support/tracks-support-show-panel-after-dragging-controls.html [ Pass Failure ]
</span><del>-webkit.org/b/167373 media/modern-media-controls/tracks-support/tracks-support-show-panel-fullscreen.html [ Pass Failure ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/169568 media/modern-media-controls/volume-down-support/volume-down-support.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-15 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Tracks menu overlaps controls bar in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=169670
+ <rdar://problem/31060086>
+
+ Reviewed by Eric Carlson.
+
+ It used to be that the top of the tracks button was the same as the top of the controls
+ bar, but that changed when we fixed https://bugs.webkit.org/show_bug.cgi?id=169412. We
+ now use the top of the controls bar to computed the y-position for the tracks panel.
+
+ We are not adding a new test, instead we're unflaking a test that started failing
+ reliably once we fixed https://bugs.webkit.org/show_bug.cgi?id=169412.
+
+ * Modules/modern-media-controls/controls/macos-media-controls.js:
+ (MacOSMediaControls.prototype.showTracksPanel):
+
</ins><span class="cx"> 2017-03-14 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up RTCPeerConnection IDL
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js (213993 => 213994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js 2017-03-15 18:15:33 UTC (rev 213993)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js 2017-03-15 18:21:18 UTC (rev 213994)
</span><span class="lines">@@ -51,9 +51,10 @@
</span><span class="cx"> this.tracksPanel.presentInParent(this);
</span><span class="cx">
</span><span class="cx"> const controlsBounds = this.element.getBoundingClientRect();
</span><ins>+ const controlsBarBounds = this.controlsBar.element.getBoundingClientRect();
</ins><span class="cx"> const tracksButtonBounds = this.tracksButton.element.getBoundingClientRect();
</span><span class="cx"> this.tracksPanel.rightX = this.width - (tracksButtonBounds.right - controlsBounds.left);
</span><del>- this.tracksPanel.bottomY = this.height - (tracksButtonBounds.top - controlsBounds.top) + 1;
</del><ins>+ this.tracksPanel.bottomY = this.height - (controlsBarBounds.top - controlsBounds.top) + 1;
</ins><span class="cx"> this.tracksPanel.maxHeight = this.height - this.tracksPanel.bottomY - 10;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>