<!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>[208456] 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/208456">208456</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-09 11:37:22 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] UI Library: StatusLabel
https://bugs.webkit.org/show_bug.cgi?id=164544
<rdar://problem/29179541>
Reviewed by Dean Jackson.
We add a new StatusLabel class to display a string of text in place of the TimeControl.
A followup patch will add the logic to display "Error", "Loading" and "Live Broadcast"
test under the right media state.
Tests: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html
media/modern-media-controls/status-label/status-label.html
* Modules/modern-media-controls/controls/macos-inline-media-controls.css:
(.media-controls.mac.inline .time-label,):
(.media-controls.mac.inline .time-label): Deleted.
* Modules/modern-media-controls/controls/macos-inline-media-controls.js:
(MacOSInlineMediaControls.prototype.layout):
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.):
* Modules/modern-media-controls/controls/status-label.css: Added.
(.status-label):
* Modules/modern-media-controls/controls/status-label.js: Added.
(StatusLabel.prototype.get text):
(StatusLabel.prototype.set text):
(StatusLabel.prototype.commitProperty):
* Modules/modern-media-controls/js-files:
* WebCore.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorhtml">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsresourcesmediacontrolsloaderjs">trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.css</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>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsjsfiles">trunk/Source/WebCore/Modules/modern-media-controls/js-files</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsstatuslabelexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsstatuslabelhtml">trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html</a></li>
<li>trunk/LayoutTests/media/modern-media-controls/status-label/</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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabelcss">trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabeljs">trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/LayoutTests/ChangeLog 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-11-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] UI Library: StatusLabel
+ https://bugs.webkit.org/show_bug.cgi?id=164544
+ <rdar://problem/29179541>
+
+ Reviewed by Dean Jackson.
+
+ Adding new tests for the core properties of the new StatusLabel class, as well as adding a test
+ to check we use the correct layout when the StatusLabel has its text set and the time controls
+ needs to be replaced with it. We also make a few existing tests use the script loader so that
+ they continue to pass with the addition of a new JS class.
+
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label-expected.txt: Added.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html: Added.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles.html:
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html:
+ * media/modern-media-controls/macos-media-controls/macos-media-controls.html:
+ * media/modern-media-controls/media-controls/media-controls-constructor-expected.txt:
+ * media/modern-media-controls/media-controls/media-controls-constructor.html:
+ * media/modern-media-controls/media-controls/media-controls-placard.html:
+ * media/modern-media-controls/media-controls/media-controls-start-button.html:
+ * media/modern-media-controls/resources/media-controls-loader.js:
+ * media/modern-media-controls/status-label/status-label-expected.txt: Added.
+ * media/modern-media-controls/status-label/status-label.html: Added.
+
</ins><span class="cx"> 2016-11-08 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] UI Library: iOS inline controls
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsstatuslabelexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label-expected.txt (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label-expected.txt 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Testing the MacOSInlineMediaControls layout with the statusLabel property set.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Default state
+PASS mediaControls.controlsBar.children.includes(mediaControls.statusLabel) is false
+PASS mediaControls.controlsBar.children.includes(mediaControls.timeControl) is true
+
+After setting statusLabel
+PASS mediaControls.controlsBar.children.includes(mediaControls.statusLabel) is true
+PASS mediaControls.controlsBar.children.includes(mediaControls.timeControl) is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosinlinemediacontrolsmacosinlinemediacontrolsstatuslabelhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,35 @@
</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 <code>MacOSInlineMediaControls</code> layout with the <code>statusLabel</code> property set.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new MacOSInlineMediaControls({ width: 680, height: 50 });
+
+let numberOfFrames = 0;
+scheduler.frameDidFire = function()
+{
+
+ numberOfFrames++;
+
+ if (numberOfFrames == 1) {
+ debug("Default state");
+ shouldBeFalse("mediaControls.controlsBar.children.includes(mediaControls.statusLabel)");
+ shouldBeTrue("mediaControls.controlsBar.children.includes(mediaControls.timeControl)");
+ mediaControls.statusLabel.text = "Hello World!";
+ } else if (numberOfFrames == 2) {
+ debug("");
+ debug("After setting statusLabel");
+ shouldBeTrue("mediaControls.controlsBar.children.includes(mediaControls.statusLabel)");
+ shouldBeFalse("mediaControls.controlsBar.children.includes(mediaControls.timeControl)");
+ debug("");
+ finishJSTest();
+ }
+};
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> PASS mediaControls.airplayButton instanceof AirplayButton is true
</span><span class="cx"> PASS mediaControls.pipButton instanceof PiPButton is true
</span><span class="cx"> PASS mediaControls.fullscreenButton instanceof FullscreenButton is true
</span><ins>+PASS mediaControls.statusLabel instanceof StatusLabel is true
</ins><span class="cx"> PASS mediaControls.timeControl instanceof TimeControl is true
</span><span class="cx"> PASS mediaControls.airplayPlacard instanceof AirplayPlacard is true
</span><span class="cx"> PASS mediaControls.pipPlacard instanceof PiPPlacard is true
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> shouldBeTrue("mediaControls.airplayButton instanceof AirplayButton");
</span><span class="cx"> shouldBeTrue("mediaControls.pipButton instanceof PiPButton");
</span><span class="cx"> shouldBeTrue("mediaControls.fullscreenButton instanceof FullscreenButton");
</span><ins>+shouldBeTrue("mediaControls.statusLabel instanceof StatusLabel");
</ins><span class="cx"> shouldBeTrue("mediaControls.timeControl instanceof TimeControl");
</span><span class="cx"> shouldBeTrue("mediaControls.airplayPlacard instanceof AirplayPlacard");
</span><span class="cx"> shouldBeTrue("mediaControls.pipPlacard instanceof PiPPlacard");
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsresourcesmediacontrolsloaderjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> const layoutTestsPath = window.location.href.substr(0, window.location.href.indexOf("/LayoutTests/"));
</span><span class="cx"> const modulePath = layoutTestsPath ? layoutTestsPath + "/Source/WebCore/Modules/modern-media-controls" : "/modern-media-controls";
</span><span class="cx">
</span><del>- ["media-controls", "scrubber", "volume-slider", "slider", "button", "start-button", "icon-button", "airplay-button", "time-label", "macos-inline-media-controls", "macos-fullscreen-media-controls", "ios-inline-media-controls", "buttons-container", "placard"].forEach(cssFile => {
</del><ins>+ ["media-controls", "scrubber", "volume-slider", "slider", "button", "start-button", "icon-button", "airplay-button", "time-label", "status-label", "macos-inline-media-controls", "macos-fullscreen-media-controls", "ios-inline-media-controls", "buttons-container", "placard"].forEach(cssFile => {
</ins><span class="cx"> document.write(`<link rel="stylesheet" type="text/css" href="${modulePath}/controls/${cssFile}.css">`);
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Testing the StatusText class.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Constructor
+PASS statusLabel.element.localName is "div"
+PASS statusLabel.element.className is "status-label"
+PASS statusLabel.text is ""
+
+Setting the `text` property
+layoutDelegate.needsLayout set to true
+PASS statusLabel.text is "Hello World!"
+PASS statusLabel.element.textContent is "Hello World!"
+
+Computed style
+PASS style.position is "absolute"
+PASS style.textOverflow is "ellipsis"
+PASS style.whiteSpace is "nowrap"
+PASS style.overflow is "hidden"
+PASS style.fontFamily is "-apple-system"
+PASS style.fontSize is "14px"
+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
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsstatuslabelstatuslabelhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,53 @@
</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 the <code>StatusText</code> class.");
+
+const statusLabel = new StatusLabel({
+ set needsLayout(flag)
+ {
+ debug("layoutDelegate.needsLayout set to " + flag);
+ }
+});
+
+debug("Constructor");
+shouldBeEqualToString("statusLabel.element.localName", "div");
+shouldBeEqualToString("statusLabel.element.className", "status-label");
+shouldBeEqualToString("statusLabel.text", "");
+
+debug("");
+debug("Setting the `text` property");
+statusLabel.text = "Hello World!";
+shouldBeEqualToString("statusLabel.text", "Hello World!");
+
+let style;
+scheduler.frameDidFire = function()
+{
+ document.body.appendChild(statusLabel.element);
+
+ shouldBeEqualToString("statusLabel.element.textContent", "Hello World!");
+
+ debug("");
+ debug("Computed style");
+ style = window.getComputedStyle(statusLabel.element);
+ shouldBeEqualToString("style.position", "absolute");
+ shouldBeEqualToString("style.textOverflow", "ellipsis");
+ shouldBeEqualToString("style.whiteSpace", "nowrap");
+ shouldBeEqualToString("style.overflow", "hidden");
+ shouldBeEqualToString("style.fontFamily", "-apple-system");
+ shouldBeEqualToString("style.fontSize", "14px");
+ shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.572)");
+
+ statusLabel.element.remove();
+ debug("");
+ finishJSTest();
+}
+
+</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 (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-11-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] UI Library: StatusLabel
+ https://bugs.webkit.org/show_bug.cgi?id=164544
+ <rdar://problem/29179541>
+
+ Reviewed by Dean Jackson.
+
+ We add a new StatusLabel class to display a string of text in place of the TimeControl.
+ A followup patch will add the logic to display "Error", "Loading" and "Live Broadcast"
+ test under the right media state.
+
+ Tests: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-status-label.html
+ media/modern-media-controls/status-label/status-label.html
+
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.css:
+ (.media-controls.mac.inline .time-label,):
+ (.media-controls.mac.inline .time-label): Deleted.
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.js:
+ (MacOSInlineMediaControls.prototype.layout):
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.):
+ * Modules/modern-media-controls/controls/status-label.css: Added.
+ (.status-label):
+ * Modules/modern-media-controls/controls/status-label.js: Added.
+ (StatusLabel.prototype.get text):
+ (StatusLabel.prototype.set text):
+ (StatusLabel.prototype.commitProperty):
+ * Modules/modern-media-controls/js-files:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2016-11-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Stop using deprecated AppKit enumeration values
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.css (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.css 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.css 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -91,9 +91,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.mac.inline .time-label {
</del><ins>+.media-controls.mac.inline .time-label,
+.media-controls.mac.inline .status-label {
</ins><span class="cx"> top: 14.5px;
</span><span class="cx"> }
</span><span class="cx">
</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 (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -74,13 +74,19 @@
</span><span class="cx"> this._leftContainer.layout();
</span><span class="cx"> this._rightContainer.layout();
</span><span class="cx">
</span><del>- this.timeControl.width = this.width - this._leftContainer.width - this._rightContainer.width;
</del><ins>+ const middleContainer = !!this.statusLabel.text ? this.statusLabel : this.timeControl;
+ this.controlsBar.children = [this._leftContainer, middleContainer, this._rightContainer, this._volumeSliderContainer];
</ins><span class="cx">
</span><del>- if (this.timeControl.isSufficientlyWide) {
- this.controlsBar.insertBefore(this.timeControl, this._rightContainer);
</del><ins>+ if (middleContainer === this.timeControl)
+ this.timeControl.width = this.width - this._leftContainer.width - this._rightContainer.width;
+
+ if (middleContainer === this.timeControl && this.timeControl.isSufficientlyWide)
</ins><span class="cx"> this.timeControl.x = this._leftContainer.width;
</span><del>- } else {
</del><ins>+ else {
</ins><span class="cx"> this.timeControl.remove();
</span><ins>+
+ let droppedControls = false;
+
</ins><span class="cx"> // Since we don't have enough space to display the scrubber, we may also not have
</span><span class="cx"> // enough space to display all buttons in the left and right containers, so gradually drop them.
</span><span class="cx"> for (let button of [this.airplayButton, this.pipButton, this.tracksButton, this.muteButton, this.skipBackButton, this.fullscreenButton]) {
</span><span class="lines">@@ -88,6 +94,8 @@
</span><span class="cx"> if (this._leftContainer.width + this._rightContainer.width < this.width)
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ droppedControls = true;
+
</ins><span class="cx"> // If the button was already not participating in layout, we can skip it.
</span><span class="cx"> if (!button.visible)
</span><span class="cx"> continue;
</span><span class="lines">@@ -98,6 +106,12 @@
</span><span class="cx"> this._leftContainer.layout();
</span><span class="cx"> this._rightContainer.layout();
</span><span class="cx"> }
</span><ins>+
+ // We didn't need to drop controls and we have status text to show.
+ if (!droppedControls && middleContainer === this.statusLabel) {
+ this.statusLabel.x = this._leftContainer.width;
+ this.statusLabel.width = this.width - this._leftContainer.width - this._rightContainer.width;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._rightContainer.x = this.width - this._rightContainer.width;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> this.pipButton = new PiPButton(this);
</span><span class="cx"> this.fullscreenButton = new FullscreenButton(this);
</span><span class="cx">
</span><ins>+ this.statusLabel = new StatusLabel(this)
</ins><span class="cx"> this.timeControl = new TimeControl(this);
</span><span class="cx">
</span><span class="cx"> this.controlsBar = new LayoutItem({
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabelcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.css 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+.status-label {
+ position: absolute;
+
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+
+ font-family: -apple-system;
+ font-size: 14px;
+
+ color: rgba(255, 255, 255, 0.572);
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsstatuslabeljs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.js (0 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/status-label.js 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class StatusLabel extends LayoutItem
+{
+
+ constructor(layoutDelegate)
+ {
+ super({
+ element: `<div class="status-label">`,
+ layoutDelegate
+ });
+
+ this._text = "";
+ }
+
+ // Public
+
+ get text()
+ {
+ return this._text;
+ }
+
+ set text(text)
+ {
+ if (text === this._text)
+ return;
+
+ this._text = text;
+ this.markDirtyProperty("text");
+
+ if (this.layoutDelegate)
+ this.layoutDelegate.needsLayout = true;
+ }
+
+ // Protected
+
+ commitProperty(propertyName)
+ {
+ if (propertyName === "text")
+ this.element.textContent = this._text;
+ else
+ super.commitProperty(propertyName);
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsjsfiles"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> controls/rewind-button.js
</span><span class="cx"> controls/forward-button.js
</span><span class="cx"> controls/buttons-container.js
</span><ins>+controls/status-label.js
</ins><span class="cx"> controls/media-controls.js
</span><span class="cx"> controls/ios-inline-media-controls.js
</span><span class="cx"> controls/macos-media-controls.js
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (208455 => 208456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-09 19:31:56 UTC (rev 208455)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-09 19:37:22 UTC (rev 208456)
</span><span class="lines">@@ -9935,6 +9935,8 @@
</span><span class="cx"> 7177E2481DB80D2F00919A0B /* start-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "start-support.js"; sourceTree = "<group>"; };
</span><span class="cx"> 717F90571DC40ED60006F520 /* volume-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-support.js"; sourceTree = "<group>"; };
</span><span class="cx"> 717F90581DC4BB600006F520 /* airplay-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-support.js"; sourceTree = "<group>"; };
</span><ins>+ 718C7F561DD385C500B733C8 /* status-label.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "status-label.css"; sourceTree = "<group>"; };
+ 718C7F571DD385C500B733C8 /* status-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-label.js"; sourceTree = "<group>"; };
</ins><span class="cx"> 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 71B1E123164048CC00B1880A /* InspectorLayerTreeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorLayerTreeAgent.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17898,6 +17900,8 @@
</span><span class="cx"> 716FA0F81DB26591007323CC /* slider.js */,
</span><span class="cx"> 716FA0F91DB26591007323CC /* start-button.css */,
</span><span class="cx"> 716FA0FA1DB26591007323CC /* start-button.js */,
</span><ins>+ 718C7F561DD385C500B733C8 /* status-label.css */,
+ 718C7F571DD385C500B733C8 /* status-label.js */,
</ins><span class="cx"> 716FA0FB1DB26591007323CC /* time-control.js */,
</span><span class="cx"> 716FA0FC1DB26591007323CC /* time-label.css */,
</span><span class="cx"> 716FA0FD1DB26591007323CC /* time-label.js */,
</span></span></pre>
</div>
</div>
</body>
</html>