<!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>[213098] 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/213098">213098</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 15:33:45 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] StatusLabel should use similar properties to TimeLabel
https://bugs.webkit.org/show_bug.cgi?id=168938
<rdar://problem/30743185>
Patch by Antoine Quint <graouts@apple.com> on 2017-02-27
Reviewed by Dean Jackson.
Source/WebCore:
Ensure we use the same styling properties for StatusLabel and TimeLabel.
Tests: media/modern-media-controls/status-label/status-label-ios.html
media/modern-media-controls/status-label/status-label-macos.html
* Modules/modern-media-controls/controls/ios-inline-media-controls.css:
(.media-controls.ios.inline .time-label,):
(.media-controls.ios.inline .time-label): Deleted.
* Modules/modern-media-controls/controls/macos-media-controls.css:
(.media-controls.mac > .controls-bar .time-label,):
(.media-controls.mac > .controls-bar .time-label): Deleted.
* Modules/modern-media-controls/controls/status-label.css:
(.status-label):
LayoutTests:
We add new tests to ensure we test all the various styles that can be applied
to a StatusLabel.
* media/modern-media-controls/status-label/status-label-expected.txt:
* media/modern-media-controls/status-label/status-label-ios-expected.txt: Added.
* media/modern-media-controls/status-label/status-label-ios.html: Added.
* media/modern-media-controls/status-label/status-label-macos-expected.txt: Added.
* media/modern-media-controls/status-label/status-label-macos.html: Added.
* media/modern-media-controls/status-label/status-label.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelexpectedtxt">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelhtml">trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiosinlinemediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabelcss">trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabeliosexpectedtxt">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelioshtml">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelmacosexpectedtxt">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelmacoshtml">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/LayoutTests/ChangeLog 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] StatusLabel should use similar properties to TimeLabel
+ https://bugs.webkit.org/show_bug.cgi?id=168938
+ <rdar://problem/30743185>
+
+ Reviewed by Dean Jackson.
+
+ We add new tests to ensure we test all the various styles that can be applied
+ to a StatusLabel.
+
+ * media/modern-media-controls/status-label/status-label-expected.txt:
+ * media/modern-media-controls/status-label/status-label-ios-expected.txt: Added.
+ * media/modern-media-controls/status-label/status-label-ios.html: Added.
+ * media/modern-media-controls/status-label/status-label-macos-expected.txt: Added.
+ * media/modern-media-controls/status-label/status-label-macos.html: Added.
+ * media/modern-media-controls/status-label/status-label.html:
+
</ins><span class="cx"> 2017-02-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unprefix -webkit-line-break
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -19,10 +19,6 @@
</span><span class="cx"> PASS style.whiteSpace is "nowrap"
</span><span class="cx"> PASS style.overflow is "hidden"
</span><span class="cx"> PASS style.fontSize is "14px"
</span><del>-PASS rgba(style.color).r is 255
-PASS rgba(style.color).g is 255
-PASS rgba(style.color).b is 255
-PASS rgba(style.color).a is within 0.001 of 0.572
</del><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabeliosexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt (0 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Testing StatusText properties when used in IOSInlineMediaControls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.body.contains(mediaControls.statusLabel.element) became true
+PASS style.top is "14.5px"
+PASS style.color is "rgb(0, 0, 0)"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelioshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html (0 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing <code>StatusText</code> properties when used in <code>IOSInlineMediaControls</code>.");
+
+const mediaControls = new IOSInlineMediaControls({ width: 600, height: 300 });
+mediaControls.statusLabel.enabled = true;
+mediaControls.statusLabel.text = "Hello World";
+
+document.body.appendChild(mediaControls.element);
+
+let style;
+shouldBecomeEqual("document.body.contains(mediaControls.statusLabel.element)", "true", () => {
+ style = getComputedStyle(mediaControls.statusLabel.element);
+
+ shouldBeEqualToString("style.top", "14.5px");
+ shouldBeEqualToString("style.color", "rgb(0, 0, 0)");
+
+ mediaControls.element.remove();
+ debug("");
+ finishJSTest();
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelmacosexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt (0 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Testing StatusText properties when used in MacOSInlineMediaControls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.body.contains(mediaControls.statusLabel.element) became true
+PASS style.top is "14.5px"
+PASS style.mixBlendMode is "plus-lighter"
+PASS rgba(style.color).r is 255
+PASS rgba(style.color).g is 255
+PASS rgba(style.color).b is 255
+PASS rgba(style.color).a is within 0.001 of 0.45
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelmacoshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html (0 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing <code>StatusText</code> properties when used in <code>MacOSInlineMediaControls</code>.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 600, height: 300 });
+mediaControls.statusLabel.enabled = true;
+mediaControls.statusLabel.text = "Hello World";
+
+document.body.appendChild(mediaControls.element);
+
+let style;
+shouldBecomeEqual("document.body.contains(mediaControls.statusLabel.element)", "true", () => {
+ style = getComputedStyle(mediaControls.statusLabel.element);
+
+ shouldBeEqualToString("style.top", "14.5px");
+ shouldBeEqualToString("style.mixBlendMode", "plus-lighter");
+ shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.45)");
+
+ mediaControls.element.remove();
+ debug("");
+ finishJSTest();
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> shouldBeEqualToString("style.whiteSpace", "nowrap");
</span><span class="cx"> shouldBeEqualToString("style.overflow", "hidden");
</span><span class="cx"> shouldBeEqualToString("style.fontSize", "14px");
</span><del>- shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.572)");
</del><span class="cx">
</span><span class="cx"> statusLabel.element.remove();
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/Source/WebCore/ChangeLog 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] StatusLabel should use similar properties to TimeLabel
+ https://bugs.webkit.org/show_bug.cgi?id=168938
+ <rdar://problem/30743185>
+
+ Reviewed by Dean Jackson.
+
+ Ensure we use the same styling properties for StatusLabel and TimeLabel.
+
+ Tests: media/modern-media-controls/status-label/status-label-ios.html
+ media/modern-media-controls/status-label/status-label-macos.html
+
+ * Modules/modern-media-controls/controls/ios-inline-media-controls.css:
+ (.media-controls.ios.inline .time-label,):
+ (.media-controls.ios.inline .time-label): Deleted.
+ * Modules/modern-media-controls/controls/macos-media-controls.css:
+ (.media-controls.mac > .controls-bar .time-label,):
+ (.media-controls.mac > .controls-bar .time-label): Deleted.
+ * Modules/modern-media-controls/controls/status-label.css:
+ (.status-label):
+
</ins><span class="cx"> 2017-02-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ICU cursor iterator to caret iterator
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiosinlinemediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -94,9 +94,10 @@
</span><span class="cx"> -webkit-mask-position-y: 13px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Time labels */
</del><ins>+/* Labels */
</ins><span class="cx">
</span><del>-.media-controls.ios.inline .time-label {
</del><ins>+.media-controls.ios.inline .time-label,
+.media-controls.ios.inline .status-label {
</ins><span class="cx"> top: 14.5px;
</span><span class="cx"> color: black;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.css (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.css 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.css 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> mix-blend-mode: plus-lighter;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-controls.mac > .controls-bar .time-label {
</del><ins>+.media-controls.mac > .controls-bar .time-label,
+.media-controls.mac > .controls-bar .status-label {
</ins><span class="cx"> color: rgba(255, 255, 255, 0.45);
</span><span class="cx"> mix-blend-mode: plus-lighter;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css (213097 => 213098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css 2017-02-27 23:07:25 UTC (rev 213097)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css 2017-02-27 23:33:45 UTC (rev 213098)
</span><span class="lines">@@ -32,6 +32,4 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx">
</span><span class="cx"> font-size: 14px;
</span><del>-
- color: rgba(255, 255, 255, 0.572);
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>