<!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>[209186] trunk/LayoutTests</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/209186">209186</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-01 10:38:51 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Fix media/modern-media-controls/status-label/status-label.html
https://bugs.webkit.org/show_bug.cgi?id=165259
Reviewed by Dean Jackson.
We broke the test at media/modern-media-controls/status-label/status-label.html with the
fix for https://bugs.webkit.org/show_bug.cgi?id=165239 since the test would test the
font-family for a StatusLabel which would only inherited to be -apple-system when hosted
in a MediaControls instance. We now remove this assertion and added a dedicated test
for when a StatusLabel is hosted in a MediaControls.
* media/modern-media-controls/status-label/status-label-expected.txt:
* media/modern-media-controls/status-label/status-label-font-expected.txt: Added.
* media/modern-media-controls/status-label/status-label-font.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelfontexpectedtxt">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelfonthtml">trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209185 => 209186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 18:38:51 UTC (rev 209186)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-01 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Fix media/modern-media-controls/status-label/status-label.html
+ https://bugs.webkit.org/show_bug.cgi?id=165259
+
+ Reviewed by Dean Jackson.
+
+ We broke the test at media/modern-media-controls/status-label/status-label.html with the
+ fix for https://bugs.webkit.org/show_bug.cgi?id=165239 since the test would test the
+ font-family for a StatusLabel which would only inherited to be -apple-system when hosted
+ in a MediaControls instance. We now remove this assertion and added a dedicated test
+ for when a StatusLabel is hosted in a MediaControls.
+
+ * media/modern-media-controls/status-label/status-label-expected.txt:
+ * media/modern-media-controls/status-label/status-label-font-expected.txt: Added.
+ * media/modern-media-controls/status-label/status-label-font.html: Added.
+ * media/modern-media-controls/status-label/status-label.html:
+
</ins><span class="cx"> 2016-12-01 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html as failing on mac-wk1.
</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 (209185 => 209186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2016-12-01 18:38:51 UTC (rev 209186)
</span><span class="lines">@@ -18,7 +18,6 @@
</span><span class="cx"> PASS style.textOverflow is "ellipsis"
</span><span class="cx"> PASS style.whiteSpace is "nowrap"
</span><span class="cx"> PASS style.overflow is "hidden"
</span><del>-PASS style.fontFamily is "-apple-system"
</del><span class="cx"> PASS style.fontSize is "14px"
</span><span class="cx"> PASS rgba(style.color).r is 255
</span><span class="cx"> PASS rgba(style.color).g is 255
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelfontexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt (0 => 209186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt 2016-12-01 18:38:51 UTC (rev 209186)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Testing the StatusLabel font is correctly set when hosted in media controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(mediaControls.statusLabel.element).fontFamily is "-apple-system"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelfonthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html (0 => 209186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html 2016-12-01 18:38:51 UTC (rev 209186)
</span><span class="lines">@@ -0,0 +1,25 @@
</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">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>StatusLabel</code> font is correctly set when hosted in media controls.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 600, height: 300 });
+mediaControls.showsStartButton = false;
+mediaControls.statusLabel.text = "Hello";
+document.body.appendChild(mediaControls.element);
+
+scheduler.frameDidFire = function()
+{
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.statusLabel.element).fontFamily", "-apple-system");
+ 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 (209185 => 209186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2016-12-01 18:38:51 UTC (rev 209186)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> shouldBeEqualToString("style.textOverflow", "ellipsis");
</span><span class="cx"> shouldBeEqualToString("style.whiteSpace", "nowrap");
</span><span class="cx"> shouldBeEqualToString("style.overflow", "hidden");
</span><del>- shouldBeEqualToString("style.fontFamily", "-apple-system");
</del><span class="cx"> shouldBeEqualToString("style.fontSize", "14px");
</span><span class="cx"> shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.572)");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>