<!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>[214471] 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/214471">214471</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-28 03:42:39 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Double-clicking the captions button while the captions popover is open prevents the popover from being opened again
https://bugs.webkit.org/show_bug.cgi?id=170171
<rdar://problem/31095500>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-28
Reviewed by Dean Jackson.
Source/WebCore:
We used to consider that the tracks panel was presented as long as it had a parent, but since we were using for the animated
transition to complete before actually removing the panel from the node hierarchy, consecutive calls to hide then present
would fail to present the panel. We now use a private instance variable to track the presented state which is set immediately
as presentInParent() and hide() are called.
Test: media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html
* Modules/modern-media-controls/controls/tracks-panel.js:
(TracksPanel.prototype.get presented):
(TracksPanel.prototype.presentInParent):
(TracksPanel.prototype.hide):
LayoutTests:
Adding a new test that runs the steps to reproduce the issue, and rebaselining an existing one now that
the "presented" property returns false immediately after calling hide() on the panel.
* media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt:
* media/modern-media-controls/tracks-panel/tracks-panel-hide.html:
* media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt: Added.
* media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelhideexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelhidehtml">trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolstrackspaneljs">trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelthendoubleclickontracksbuttonexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelthendoubleclickontracksbuttonhtml">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214470 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-28 09:33:21 UTC (rev 214470)
+++ trunk/LayoutTests/ChangeLog 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-28 Antoine Quint <graouts@apple.com>
+
+ REGRESSION: Double-clicking the captions button while the captions popover is open prevents the popover from being opened again
+ https://bugs.webkit.org/show_bug.cgi?id=170171
+ <rdar://problem/31095500>
+
+ Reviewed by Dean Jackson.
+
+ Adding a new test that runs the steps to reproduce the issue, and rebaselining an existing one now that
+ the "presented" property returns false immediately after calling hide() on the panel.
+
+ * media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt:
+ * media/modern-media-controls/tracks-panel/tracks-panel-hide.html:
+ * media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html: Added.
+
</ins><span class="cx"> 2017-03-28 Aaron Chu <aaron_chu@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Media controls should be able to be re-activated after faded away
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelhideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt (214470 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt 2017-03-28 09:33:21 UTC (rev 214470)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide-expected.txt 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> PASS tracksPanel.presented is true
</span><span class="cx">
</span><span class="cx"> tracksPanel.hide()
</span><del>-PASS tracksPanel.presented is true
</del><ins>+PASS tracksPanel.presented is false
</ins><span class="cx">
</span><span class="cx"> Transition ended
</span><span class="cx"> PASS tracksPanel.presented is false
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelhidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide.html (214470 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide.html 2017-03-28 09:33:21 UTC (rev 214470)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-hide.html 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> debug("tracksPanel.hide()");
</span><span class="cx"> window.requestAnimationFrame(() => {
</span><span class="cx"> tracksPanel.hide();
</span><del>- shouldBeTrue("tracksPanel.presented");
</del><ins>+ shouldBeFalse("tracksPanel.presented");
</ins><span class="cx"> tracksPanel.element.addEventListener("transitionend", (event) => {
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Transition ended");
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelthendoubleclickontracksbuttonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt (0 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button-expected.txt 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Ensure that double-clicking the tracks button when the tracks panel makes the panel appear again.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media started playing
+PASS shadowRoot.querySelector('button.tracks') became different from null
+PASS shadowRoot.querySelector('button.tracks').getBoundingClientRect().width became different from 0
+PASS shadowRoot.querySelector('.tracks-panel') became different from null
+PASS shadowRoot.querySelector('.tracks-panel') is not null
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportshowpanelthendoubleclickontracksbuttonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html (0 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -0,0 +1,41 @@
</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/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Ensure that double-clicking the tracks button when the tracks panel makes the panel appear again.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ debug("Media started playing");
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks')", "null", () => {
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks').getBoundingClientRect().width", "0", () => {
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ shouldBecomeDifferent("shadowRoot.querySelector('.tracks-panel')", "null", () => {
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ requestAnimationFrame(() => {
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ // Give the transitionend event time to fire if it were to happen, which it should not.
+ setTimeout(() => {
+ shouldNotBe("shadowRoot.querySelector('.tracks-panel')", "null");
+ debug("");
+ media.remove();
+ finishJSTest();
+ }, 500);
+ });
+ });
+ });
+ });
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214470 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-28 09:33:21 UTC (rev 214470)
+++ trunk/Source/WebCore/ChangeLog 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-28 Antoine Quint <graouts@apple.com>
+
+ REGRESSION: Double-clicking the captions button while the captions popover is open prevents the popover from being opened again
+ https://bugs.webkit.org/show_bug.cgi?id=170171
+ <rdar://problem/31095500>
+
+ Reviewed by Dean Jackson.
+
+ We used to consider that the tracks panel was presented as long as it had a parent, but since we were using for the animated
+ transition to complete before actually removing the panel from the node hierarchy, consecutive calls to hide then present
+ would fail to present the panel. We now use a private instance variable to track the presented state which is set immediately
+ as presentInParent() and hide() are called.
+
+ Test: media/modern-media-controls/tracks-support/tracks-support-show-panel-then-double-click-on-tracks-button.html
+
+ * Modules/modern-media-controls/controls/tracks-panel.js:
+ (TracksPanel.prototype.get presented):
+ (TracksPanel.prototype.presentInParent):
+ (TracksPanel.prototype.hide):
+
</ins><span class="cx"> 2017-03-28 Aaron Chu <aaron_chu@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Media controls should be able to be re-activated after faded away
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolstrackspaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js (214470 => 214471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js 2017-03-28 09:33:21 UTC (rev 214470)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js 2017-03-28 10:42:39 UTC (rev 214471)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> this._scrollableContainer = new LayoutNode(`<div class="scrollable-container"></div>`);
</span><span class="cx"> this._rightX = 0;
</span><span class="cx"> this._bottomY = 0;
</span><ins>+ this._presented = false;
</ins><span class="cx">
</span><span class="cx"> this.children = [this._backgroundTint, this._scrollableContainer];
</span><span class="cx"> }
</span><span class="lines">@@ -17,14 +18,16 @@
</span><span class="cx">
</span><span class="cx"> get presented()
</span><span class="cx"> {
</span><del>- return !!this.parent;
</del><ins>+ return this._presented;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> presentInParent(node)
</span><span class="cx"> {
</span><del>- if (this.parent === node)
</del><ins>+ if (this._presented && this.parent === node)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._presented = true;
+
</ins><span class="cx"> this._scrollableContainer.children = this._childrenFromDataSource();
</span><span class="cx">
</span><span class="cx"> node.addChild(this);
</span><span class="lines">@@ -40,9 +43,11 @@
</span><span class="cx">
</span><span class="cx"> hide()
</span><span class="cx"> {
</span><del>- if (!this.presented)
</del><ins>+ if (!this._presented)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._presented = false;
+
</ins><span class="cx"> this._mousedownTarget().removeEventListener("mousedown", this, true);
</span><span class="cx"> window.removeEventListener("keydown", this, true);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>