<!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>[214611] 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/214611">214611</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-30 10:06:21 -0700 (Thu, 30 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Invalid placard icon is not visible for short video
https://bugs.webkit.org/show_bug.cgi?id=170277
<rdar://problem/31327955>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-30
Reviewed by Eric Carlson.
Source/WebCore:
Make the minimum dimension needed to display a placard icon configurable and let the
invalid placard use a 50pt dimension. We also make a drive-by fix to reset "text-align"
for media controls as having a "text-align: center" inherited value would mess up
positioning of the placard icon and make it flush to the right of the placard.
Test: media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html
* Modules/modern-media-controls/controls/invalid-placard.js:
(InvalidPlacard):
* Modules/modern-media-controls/controls/media-controls.css:
(.media-controls):
* Modules/modern-media-controls/controls/placard.js:
(Placard.prototype.layout):
LayoutTests:
Add a new test to check that we correctly hide the invalid icon only when
there is no space left to display it.
* media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt: Added.
* media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsinvalidplacardjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/invalid-placard.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsplacardjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/placard.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsinvalidplacardinvalidplacardconstrainedmetricsexpectedtxt">trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsinvalidplacardinvalidplacardconstrainedmetricshtml">trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214610 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-30 16:29:36 UTC (rev 214610)
+++ trunk/LayoutTests/ChangeLog 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-30 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Invalid placard icon is not visible for short video
+ https://bugs.webkit.org/show_bug.cgi?id=170277
+ <rdar://problem/31327955>
+
+ Reviewed by Eric Carlson.
+
+ Add a new test to check that we correctly hide the invalid icon only when
+ there is no space left to display it.
+
+ * media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt: Added.
+ * media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html: Added.
+
</ins><span class="cx"> 2017-03-27 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Clamp the number of autorepeat tracks
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsinvalidplacardinvalidplacardconstrainedmetricsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt (0 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics-expected.txt 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Testing the invalid placard with constrained metrics.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Setting width and height to 50
+PASS placard.children[0].children.length is 1
+PASS placard.children[0].children.length is 1
+PASS placard.children[0].children[0] instanceof IconButton is true
+
+Setting width and height to 49
+PASS placard.children[0].children.length is 0
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsinvalidplacardinvalidplacardconstrainedmetricshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html (0 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing the invalid placard with constrained metrics.");
+
+const placard = new InvalidPlacard({ layoutTraits: LayoutTraits.macOS });
+
+debug("Setting width and height to 50");
+placard.width = 50;
+placard.height = 50;
+shouldBe("placard.children[0].children.length", "1");
+shouldBe("placard.children[0].children.length", "1");
+shouldBeTrue("placard.children[0].children[0] instanceof IconButton");
+
+debug("");
+debug("Setting width and height to 49");
+placard.width = 49;
+placard.height = 49;
+shouldBe("placard.children[0].children.length", "0");
+
+debug("");
+
+</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 (214610 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-30 16:29:36 UTC (rev 214610)
+++ trunk/Source/WebCore/ChangeLog 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-03-30 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Invalid placard icon is not visible for short video
+ https://bugs.webkit.org/show_bug.cgi?id=170277
+ <rdar://problem/31327955>
+
+ Reviewed by Eric Carlson.
+
+ Make the minimum dimension needed to display a placard icon configurable and let the
+ invalid placard use a 50pt dimension. We also make a drive-by fix to reset "text-align"
+ for media controls as having a "text-align: center" inherited value would mess up
+ positioning of the placard icon and make it flush to the right of the placard.
+
+ Test: media/modern-media-controls/invalid-placard/invalid-placard-constrained-metrics.html
+
+ * Modules/modern-media-controls/controls/invalid-placard.js:
+ (InvalidPlacard):
+ * Modules/modern-media-controls/controls/media-controls.css:
+ (.media-controls):
+ * Modules/modern-media-controls/controls/placard.js:
+ (Placard.prototype.layout):
+
</ins><span class="cx"> 2017-03-30 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GCrypt] Register missing algorithms in CryptoAlgorithmRegistry::platformRegisterAlgoritmhs()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsinvalidplacardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/invalid-placard.js (214610 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/invalid-placard.js 2017-03-30 16:29:36 UTC (rev 214610)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/invalid-placard.js 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> iconName: Icons.InvalidPlacard,
</span><span class="cx"> layoutDelegate
</span><span class="cx"> });
</span><ins>+
+ this.minDimensionToDisplayIcon = 50;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (214610 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2017-03-30 16:29:36 UTC (rev 214610)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> font-family: -apple-system;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> white-space: nowrap;
</span><ins>+ text-align: initial;
</ins><span class="cx"> cursor: default;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsplacardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/placard.js (214610 => 214611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/placard.js 2017-03-30 16:29:36 UTC (rev 214610)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/placard.js 2017-03-30 17:06:21 UTC (rev 214611)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-const MinWidthToDisplayIcon = 170;
-const MinHeightToDisplayIcon = 170;
</del><span class="cx"> const MinHeightToDisplayDescription = 100;
</span><span class="cx"> const MinHeightToDisplayTitle = 40;
</span><span class="cx">
</span><span class="lines">@@ -51,6 +49,8 @@
</span><span class="cx"> if (!!description)
</span><span class="cx"> this._descriptionNode = new LayoutNode(`<div class="description">${description}</div>`);
</span><span class="cx">
</span><ins>+ this.minDimensionToDisplayIcon = 170;
+
</ins><span class="cx"> this.width = width;
</span><span class="cx"> this.height = height;
</span><span class="cx"> }
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> const children = [];
</span><span class="cx">
</span><del>- if (this._iconButton && this.width >= MinWidthToDisplayIcon && this.height >= MinHeightToDisplayIcon)
</del><ins>+ if (this._iconButton && this.width >= this.minDimensionToDisplayIcon && this.height >= this.minDimensionToDisplayIcon)
</ins><span class="cx"> children.push(this._iconButton);
</span><span class="cx">
</span><span class="cx"> if (this._titleNode && this.height >= MinHeightToDisplayTitle)
</span></span></pre>
</div>
</div>
</body>
</html>