<!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>[209187] 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/209187">209187</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-01 10:41:08 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Promote the "on" property from AirPlayButton to IconButton
https://bugs.webkit.org/show_bug.cgi?id=165260
Reviewed by NOBODY (OOPS!).
With the fix for https://bugs.webkit.org/show_bug.cgi?id=165239 we now set the "on"
property for the TracksButton as well, so it makes sense to provide that property
for all IconButton subclasses, not just AirplayButton.
Test: media/modern-media-controls/icon-button/icon-button-on.html
* Modules/modern-media-controls/controls/airplay-button.css:
(button.airplay.on):
* Modules/modern-media-controls/controls/airplay-button.js:
(AirplayButton):
(AirplayButton.prototype.get on): Deleted.
(AirplayButton.prototype.set on): Deleted.
* Modules/modern-media-controls/controls/icon-button.css:
(button.icon:active,):
(button.icon:active): Deleted.
* Modules/modern-media-controls/controls/icon-button.js:
(IconButton.prototype.get on):
(IconButton.prototype.set on):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsairplaybuttonairplaybuttononhtml">trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplaybuttoncss">trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplaybuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconbuttoncss">trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconbuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiconbuttoniconbuttononexpectedtxt">trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiconbuttoniconbuttononhtml">trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Promote the "on" property from AirPlayButton to IconButton
+ https://bugs.webkit.org/show_bug.cgi?id=165260
+
+ Reviewed by Dean Jackson.
+
+ New test for the "on" property on IconButton.
+
+ * media/modern-media-controls/airplay-button/airplay-button-on.html:
+ * media/modern-media-controls/icon-button/icon-button-on-expected.txt: Added.
+ * media/modern-media-controls/icon-button/icon-button-on.html: Added.
+
+2016-12-01 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Fix media/modern-media-controls/status-label/status-label.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165259
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsairplaybuttonairplaybuttononhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -1,14 +1,5 @@
</span><del>-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-button.css" type="text/css" media="screen">
</del><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scheduler.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-node.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-item.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-service.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js" type="text/javascript"></script>
</del><ins>+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
</ins><span class="cx"> <body>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiconbuttoniconbuttononexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on-expected.txt (0 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on-expected.txt 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Testing an IconButton has a white background-color when set to `on`.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(iconButton.element).backgroundColor is "rgb(255, 255, 255)"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiconbuttoniconbuttononhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on.html (0 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/icon-button/icon-button-on.html 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -0,0 +1,26 @@
</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 an <code>IconButton</code> has a white background-color when set to `on`.");
+
+window.jsTestIsAsync = true;
+
+const iconButton = new IconButton({ layoutDelegate: { layoutTraits: LayoutTraits.macOS } });
+iconButton.iconName = Icons.Pause;
+iconButton.on = true;
+document.body.appendChild(iconButton.element);
+
+scheduler.frameDidFire = function()
+{
+ shouldBeEqualToString("window.getComputedStyle(iconButton.element).backgroundColor", "rgb(255, 255, 255)");
+
+ iconButton.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 (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-12-01 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Promote the "on" property from AirPlayButton to IconButton
+ https://bugs.webkit.org/show_bug.cgi?id=165260
+
+ Reviewed by Dean Jackson.
+
+ With the fix for https://bugs.webkit.org/show_bug.cgi?id=165239 we now set the "on"
+ property for the TracksButton as well, so it makes sense to provide that property
+ for all IconButton subclasses, not just AirplayButton.
+
+ Test: media/modern-media-controls/icon-button/icon-button-on.html
+
+ * Modules/modern-media-controls/controls/airplay-button.css:
+ (button.airplay.on):
+ * Modules/modern-media-controls/controls/airplay-button.js:
+ (AirplayButton):
+ (AirplayButton.prototype.get on): Deleted.
+ (AirplayButton.prototype.set on): Deleted.
+ * Modules/modern-media-controls/controls/icon-button.css:
+ (button.icon:active,):
+ (button.icon:active): Deleted.
+ * Modules/modern-media-controls/controls/icon-button.js:
+ (IconButton.prototype.get on):
+ (IconButton.prototype.set on):
+
</ins><span class="cx"> 2016-11-30 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Remove custom bindings for File and Blob constructors
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplaybuttoncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.css (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.css 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.css 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -24,5 +24,5 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> button.airplay.on {
</span><del>- background-color: -apple-wireless-playback-target-active;
</del><ins>+ background-color: -apple-wireless-playback-target-active !important;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplaybuttonjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -35,15 +35,4 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Public
-
- get on()
- {
- return this.element.classList.contains("on");
- }
-
- set on(flag) {
- this.element.classList.toggle("on", flag);
- }
-
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconbuttoncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.css (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.css 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.css 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> -webkit-mask-repeat: no-repeat;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-button.icon:active {
- background-color: white;
</del><ins>+button.icon:active,
+button.icon.on {
+ background-color: white !important;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconbuttonjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.js (209186 => 209187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.js 2016-12-01 18:38:51 UTC (rev 209186)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.js 2016-12-01 18:41:08 UTC (rev 209187)
</span><span class="lines">@@ -66,6 +66,15 @@
</span><span class="cx"> this._image.addEventListener("load", this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get on()
+ {
+ return this.element.classList.contains("on");
+ }
+
+ set on(flag) {
+ this.element.classList.toggle("on", flag);
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> handleEvent(event)
</span></span></pre>
</div>
</div>
</body>
</html>