<!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>[211209] 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/211209">211209</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-26 06:58:10 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Hiding controls, changing their width and showing them again shows an incorrect layout
https://bugs.webkit.org/show_bug.cgi?id=167160
<rdar://problem/29612318>
Patch by Antoine Quint <graouts@apple.com> on 2017-01-26
Reviewed by Dean Jackson.
Source/WebCore:
When we toggle visibility of the controls bar, we notify the hosting media controls and in the case of the
macOS inline media controls, we update the controls layout which would have failed to run last time it tried
due to the controls bar being hidden.
Test: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html
* Modules/modern-media-controls/controls/controls-bar.js:
(ControlsBar.prototype.set visible):
* Modules/modern-media-controls/controls/macos-inline-media-controls.js:
(MacOSInlineMediaControls.prototype.controlsBarVisibilityDidChange):
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.prototype.controlsBarVisibilityDidChange):
LayoutTests:
Add a new test that creates media controls at a given width, hides the controls bar, increases the width, makes
the controls bar visible again, and checks that the layout was correctly updated as a result.
* media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt: Added.
* media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsresizewithhiddencontrolsbarexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsresizewithhiddencontrolsbarhtml">trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211208 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-26 10:52:20 UTC (rev 211208)
+++ trunk/LayoutTests/ChangeLog 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-26 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Hiding controls, changing their width and showing them again shows an incorrect layout
+ https://bugs.webkit.org/show_bug.cgi?id=167160
+ <rdar://problem/29612318>
+
+ Reviewed by Dean Jackson.
+
+ Add a new test that creates media controls at a given width, hides the controls bar, increases the width, makes
+ the controls bar visible again, and checks that the layout was correctly updated as a result.
+
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt: Added.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html: Added.
+
</ins><span class="cx"> 2017-01-25 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Crash under DOMSelection::deleteFromDocument()
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsresizewithhiddencontrolsbarexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt (0 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar-expected.txt 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Testing MacOSInlineMediaControls width change while the controls bar is hidden.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Making the controls bar invisible.
+
+Making the controls 100px wider
+
+Making the controls bar visible again.
+PASS rightContainer.x is expectedRightContainerX + 100
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsresizewithhiddencontrolsbarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html (0 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing <code>MacOSInlineMediaControls</code> width change while the controls bar is hidden.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new MacOSInlineMediaControls({ width: 600 });
+
+const leftContainer = mediaControls.controlsBar.children[0];
+const rightContainer = mediaControls.controlsBar.children[1];
+const buttons = leftContainer.buttons.concat(rightContainer.buttons);
+
+let numberOfFrames = 0;
+let expectedRightContainerX = 0;
+scheduler.frameDidFire = function()
+{
+ if (buttons.some(button => button.width == 0))
+ return;
+
+ numberOfFrames++;
+
+ switch (numberOfFrames) {
+ case 1:
+ mediaControls.controlsBar.visible = false;
+ debug("Making the controls bar invisible.");
+ expectedRightContainerX = rightContainer.x;
+ break;
+ case 2:
+ debug("");
+ debug("Making the controls 100px wider");
+ mediaControls.width += 100;
+ break;
+ case 3:
+ mediaControls.controlsBar.visible = true;
+ debug("");
+ debug("Making the controls bar visible again.");
+ shouldBe("rightContainer.x", "expectedRightContainerX + 100");
+
+ debug("");
+ finishMediaControlsTest();
+ break;
+ }
+
+};
+
+</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 (211208 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-26 10:52:20 UTC (rev 211208)
+++ trunk/Source/WebCore/ChangeLog 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-26 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Hiding controls, changing their width and showing them again shows an incorrect layout
+ https://bugs.webkit.org/show_bug.cgi?id=167160
+ <rdar://problem/29612318>
+
+ Reviewed by Dean Jackson.
+
+ When we toggle visibility of the controls bar, we notify the hosting media controls and in the case of the
+ macOS inline media controls, we update the controls layout which would have failed to run last time it tried
+ due to the controls bar being hidden.
+
+ Test: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-resize-with-hidden-controls-bar.html
+
+ * Modules/modern-media-controls/controls/controls-bar.js:
+ (ControlsBar.prototype.set visible):
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.js:
+ (MacOSInlineMediaControls.prototype.controlsBarVisibilityDidChange):
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.prototype.controlsBarVisibilityDidChange):
+
</ins><span class="cx"> 2017-01-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Mac][cmake] Unreviewed speculative buildfix after r211161.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js (211208 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js 2017-01-26 10:52:20 UTC (rev 211208)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -111,6 +111,9 @@
</span><span class="cx">
</span><span class="cx"> set visible(flag)
</span><span class="cx"> {
</span><ins>+ if (this.visible === flag)
+ return;
+
</ins><span class="cx"> // If we just got made visible again, let's fade the controls in.
</span><span class="cx"> if (flag && !this.visible)
</span><span class="cx"> this.faded = false;
</span><span class="lines">@@ -118,6 +121,8 @@
</span><span class="cx"> this._cancelAutoHideTimer();
</span><span class="cx">
</span><span class="cx"> super.visible = flag;
</span><ins>+
+ this._mediaControls.controlsBarVisibilityDidChange(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get faded()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js (211208 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-01-26 10:52:20 UTC (rev 211208)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -131,4 +131,10 @@
</span><span class="cx"> this._volumeSliderContainer.visible = event.type === "mouseenter" || event.relatedTarget === this._volumeSliderContainer.element;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ controlsBarVisibilityDidChange(controlsBar)
+ {
+ if (controlsBar.visible)
+ this.layout();
+ }
+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (211208 => 211209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-01-26 10:52:20 UTC (rev 211208)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-01-26 14:58:10 UTC (rev 211209)
</span><span class="lines">@@ -132,6 +132,11 @@
</span><span class="cx"> super.commitProperty(propertyName);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ controlsBarVisibilityDidChange(controlsBar)
+ {
+ // Implemented by subclasses as needed.
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _invalidateChildren()
</span></span></pre>
</div>
</div>
</body>
</html>