<!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>[192205] 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/192205">192205</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 00:46:40 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/189567">r189567</a>): Inline controls on Mac are misplaced
https://bugs.webkit.org/show_bug.cgi?id=151072
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/controls/fullscreen-button-inline-layout.html
For a certain range of video widths, <a href="http://trac.webkit.org/projects/webkit/changeset/189567">r189567</a> caused the timeline track to be
too large, pushing the buttons on the right side of the inline controls out of
the rect bounds.
The fix is to set min-width to 0. The test added checks to see that the right
edge of the fullscreen button is within the rect bounds.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-timeline-container): Add min-width.
(audio::-webkit-media-controls-panel .thumbnail-track): Ditto. Fly-by fix of height rule.
LayoutTests:
* media/controls/controls-test-helpers.js:
(ControlsTest.prototype.isLessThan): Add helper function.
* media/controls/fullscreen-button-inline-layout-expected.txt: Added.
* media/controls/fullscreen-button-inline-layout.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediacontrolscontrolstesthelpersjs">trunk/LayoutTests/media/controls/controls-test-helpers.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontrolsfullscreenbuttoninlinelayoutexpectedtxt">trunk/LayoutTests/media/controls/fullscreen-button-inline-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolsfullscreenbuttoninlinelayouthtml">trunk/LayoutTests/media/controls/fullscreen-button-inline-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192204 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-10 08:22:07 UTC (rev 192204)
+++ trunk/LayoutTests/ChangeLog 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-10 Jon Lee <jonlee@apple.com>
+
+ REGRESSION (r189567): Inline controls on Mac are misplaced
+ https://bugs.webkit.org/show_bug.cgi?id=151072
+
+ Reviewed by Eric Carlson.
+
+ * media/controls/controls-test-helpers.js:
+ (ControlsTest.prototype.isLessThan): Add helper function.
+ * media/controls/fullscreen-button-inline-layout-expected.txt: Added.
+ * media/controls/fullscreen-button-inline-layout.html: Added.
+
</ins><span class="cx"> 2015-11-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add a mock AppleTV device for testing
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolscontrolstesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls/controls-test-helpers.js (192204 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-11-10 08:22:07 UTC (rev 192204)
+++ trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -197,6 +197,14 @@
</span><span class="cx"> this.logFailure(`${this.currentMessage} Expected a non-zero value`);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ isLessThan(value)
+ {
+ if (this.currentValue < value)
+ this.logSuccess(this.currentMessage);
+ else
+ this.logFailure(`${this.currentMessage} Actual: "${this.currentValue}" is not less than Expected: "${value}"`);
+ }
+
</ins><span class="cx"> isGreaterThan(value)
</span><span class="cx"> {
</span><span class="cx"> if (this.currentValue > value)
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolsfullscreenbuttoninlinelayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/fullscreen-button-inline-layout-expected.txt (0 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/fullscreen-button-inline-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/media/controls/fullscreen-button-inline-layout-expected.txt 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests for proper flexbox layout by checking the location of the fullscreen button. It should be within the bounds of the inline bar instead of being pushed past the right edge.
+
+This test only runs in DRT!
+
+
+EVENT: canplaythrough
+PASS: We are using the apple idiom
+PASS: Fullscreen button is placed within bounds of inline controls
+
+Testing finished.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediacontrolsfullscreenbuttoninlinelayouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/fullscreen-button-inline-layout.html (0 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/fullscreen-button-inline-layout.html (rev 0)
+++ trunk/LayoutTests/media/controls/fullscreen-button-inline-layout.html 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../media-file.js"></script>
+ <script src="controls-test-helpers.js"></script>
+ <script>
+ var tester = new ControlsTest()
+ .whenReady(runTests)
+ .start();
+
+ function runTests()
+ {
+ tester.test("We are using the apple idiom")
+ .value(tester.currentState.idiom)
+ .isEqualTo("apple");
+
+ var fullscreenButtonState = tester.stateForControlsElement("Fullscreen Button");
+ var videoBox = tester.media.getBoundingClientRect();
+ tester.test("Fullscreen button is placed within bounds of inline controls")
+ .value(fullscreenButtonState.bounds.right)
+ .isLessThan(videoBox.right);
+
+ tester.end();
+ }
+ </script>
+ </head>
+ <body>
+ <p>This tests for proper flexbox layout by checking the location of the fullscreen button. It should be within the bounds of the inline bar instead of being pushed past the right edge.</p>
+ <p>This test only runs in DRT!</p>
+ <video controls width="340" height="80"></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192204 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-10 08:22:07 UTC (rev 192204)
+++ trunk/Source/WebCore/ChangeLog 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-10 Jon Lee <jonlee@apple.com>
+
+ REGRESSION (r189567): Inline controls on Mac are misplaced
+ https://bugs.webkit.org/show_bug.cgi?id=151072
+
+ Reviewed by Eric Carlson.
+
+ Test: media/controls/fullscreen-button-inline-layout.html
+
+ For a certain range of video widths, r189567 caused the timeline track to be
+ too large, pushing the buttons on the right side of the inline controls out of
+ the rect bounds.
+
+ The fix is to set min-width to 0. The test added checks to see that the right
+ edge of the fullscreen button is within the rect bounds.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-timeline-container): Add min-width.
+ (audio::-webkit-media-controls-panel .thumbnail-track): Ditto. Fly-by fix of height rule.
+
</ins><span class="cx"> 2015-11-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add a mock AppleTV device for testing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (192204 => 192205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-10 08:22:07 UTC (rev 192204)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-10 08:46:40 UTC (rev 192205)
</span><span class="lines">@@ -614,6 +614,7 @@
</span><span class="cx"> -webkit-align-items: center;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -webkit-flex: 1 1 0;
</span><ins>+ min-width: 0;
</ins><span class="cx"> position: relative;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -622,7 +623,8 @@
</span><span class="cx"> audio::-webkit-media-controls-panel .thumbnail-track {
</span><span class="cx"> position: relative;
</span><span class="cx"> -webkit-flex: 1 1 0;
</span><del>- height: 17 px;
</del><ins>+ min-width: 0;
+ height: 17px;
</ins><span class="cx"> margin: 0 2px;
</span><span class="cx"> display: -webkit-flex;
</span><span class="cx"> -webkit-align-items: stretch;
</span></span></pre>
</div>
</div>
</body>
</html>