<!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>[207299] 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/207299">207299</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-13 12:02:29 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] MediaControls base class
https://bugs.webkit.org/show_bug.cgi?id=163387
<rdar://problem/28753955>
Patch by Antoine Quint <graouts@apple.com> on 2016-10-13
Reviewed by Dean Jackson.
Source/WebCore:
Introducing the new MediaControls class which will serve as a basis for all media controls.
We will introduce specific MediaControls subclasses for macOS inline, macOS fullscreen and
iOS inline in future patches.
Tests: 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
* Modules/modern-media-controls/controls/media-controls.css: Added.
(.media-controls,):
* Modules/modern-media-controls/controls/media-controls.js: Added.
(MediaControls.):
(MediaControls.prototype.get showsStartButton):
(MediaControls.prototype.set showsStartButton):
(MediaControls.prototype.get showsPlacard):
(MediaControls.prototype.showPlacard):
(MediaControls.prototype.hidePlacard):
LayoutTests:
Testing the properties of the new MediaControls class.
* media/modern-media-controls/media-controls/media-controls-constructor-expected.txt: Added.
* media/modern-media-controls/media-controls/media-controls-constructor.html: Added.
* media/modern-media-controls/media-controls/media-controls-placard-expected.txt: Added.
* media/modern-media-controls/media-controls/media-controls-placard.html: Added.
* media/modern-media-controls/media-controls/media-controls-start-button-expected.txt: Added.
* media/modern-media-controls/media-controls/media-controls-start-button.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/media/modern-media-controls/media-controls/</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="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsplacardexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsplacardhtml">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsstartbuttonexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsstartbuttonhtml">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207298 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-13 19:01:53 UTC (rev 207298)
+++ trunk/LayoutTests/ChangeLog 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-10-13 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] MediaControls base class
+ https://bugs.webkit.org/show_bug.cgi?id=163387
+ <rdar://problem/28753955>
+
+ Reviewed by Dean Jackson.
+
+ Testing the properties of the new MediaControls class.
+
+ * media/modern-media-controls/media-controls/media-controls-constructor-expected.txt: Added.
+ * media/modern-media-controls/media-controls/media-controls-constructor.html: Added.
+ * media/modern-media-controls/media-controls/media-controls-placard-expected.txt: Added.
+ * media/modern-media-controls/media-controls/media-controls-placard.html: Added.
+ * media/modern-media-controls/media-controls/media-controls-start-button-expected.txt: Added.
+ * media/modern-media-controls/media-controls/media-controls-start-button.html: Added.
+
+2016-10-13 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] TimeControl and TimeLabel
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163356
</span><span class="cx"> <rdar://problem/28741376>
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+Testing the MediaControls constructor.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.element.localName is "div"
+PASS mediaControls.element.className is "media-controls"
+
+PASS mediaControls.width is 300
+PASS mediaControls.height is 150
+PASS mediaControls.layoutTraits is LayoutTraits.macOS
+PASS mediaControls.showsStartButton is false
+
+PASS mediaControls.startButton instanceof StartButton is true
+PASS mediaControls.playPauseButton instanceof PlayPauseButton is true
+PASS mediaControls.skipBackButton instanceof SkipBackButton is true
+PASS mediaControls.airplayButton instanceof AirplayButton is true
+PASS mediaControls.pipButton instanceof PiPButton is true
+PASS mediaControls.fullscreenButton instanceof FullscreenButton is true
+PASS mediaControls.timeControl instanceof TimeControl is true
+PASS mediaControls.airplayPlacard instanceof AirplayPlacard is true
+PASS mediaControls.pipPlacard instanceof PiPPlacard is true
+
+PASS mediaControls.controlsBar instanceof LayoutItem is true
+PASS mediaControls.controlsBar.element.localName is "div"
+PASS mediaControls.controlsBar.element.className is "controls-bar"
+
+PASS mediaControlsWithArguments.width is 600
+PASS mediaControlsWithArguments.height is 300
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsconstructorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<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/start-button.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/play-pause-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/skip-back-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/fullscreen-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/slider.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scrubber.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-label.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-control.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/media-controls.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing the <code>MediaControls</code> constructor.");
+
+iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
+
+const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
+
+shouldBeEqualToString("mediaControls.element.localName", "div");
+shouldBeEqualToString("mediaControls.element.className", "media-controls");
+
+debug("");
+shouldBe("mediaControls.width", "300");
+shouldBe("mediaControls.height", "150");
+shouldBe("mediaControls.layoutTraits", "LayoutTraits.macOS");
+shouldBeFalse("mediaControls.showsStartButton");
+
+debug("");
+shouldBeTrue("mediaControls.startButton instanceof StartButton");
+shouldBeTrue("mediaControls.playPauseButton instanceof PlayPauseButton");
+shouldBeTrue("mediaControls.skipBackButton instanceof SkipBackButton");
+shouldBeTrue("mediaControls.airplayButton instanceof AirplayButton");
+shouldBeTrue("mediaControls.pipButton instanceof PiPButton");
+shouldBeTrue("mediaControls.fullscreenButton instanceof FullscreenButton");
+shouldBeTrue("mediaControls.timeControl instanceof TimeControl");
+shouldBeTrue("mediaControls.airplayPlacard instanceof AirplayPlacard");
+shouldBeTrue("mediaControls.pipPlacard instanceof PiPPlacard");
+
+debug("");
+shouldBeTrue("mediaControls.controlsBar instanceof LayoutItem");
+shouldBeEqualToString("mediaControls.controlsBar.element.localName", "div");
+shouldBeEqualToString("mediaControls.controlsBar.element.className", "controls-bar");
+
+debug("");
+const mediaControlsWithArguments = new MediaControls({ width: 600, height: 300, layoutTraits: LayoutTraits.macOS });
+shouldBe("mediaControlsWithArguments.width", "600");
+shouldBe("mediaControlsWithArguments.height", "300");
+
+debug("");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsplacardexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+Testing the MediaControls handling of placards.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+By default, no placard is shown.
+PASS mediaControls.showsPlacard is false
+PASS mediaControls.children is [mediaControls.controlsBar]
+
+Showing the Airplay placard
+PASS mediaControls.showsPlacard is true
+PASS mediaControls.children is [mediaControls.airplayPlacard, mediaControls.controlsBar]
+
+Showing the PiP placard, hides the controls bar
+PASS mediaControls.showsPlacard is true
+PASS mediaControls.children is [mediaControls.pipPlacard]
+
+Hide placard
+PASS mediaControls.showsPlacard is false
+PASS mediaControls.children is [mediaControls.controlsBar]
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsplacardhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<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/start-button.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/play-pause-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/skip-back-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/fullscreen-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/slider.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scrubber.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-label.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-control.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/media-controls.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing the <code>MediaControls</code> handling of placards.");
+
+iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
+
+const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
+
+debug("By default, no placard is shown.");
+shouldBeFalse("mediaControls.showsPlacard");
+shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
+
+debug("");
+debug("Showing the Airplay placard");
+mediaControls.showPlacard(mediaControls.airplayPlacard);
+shouldBeTrue("mediaControls.showsPlacard");
+shouldBe("mediaControls.children", "[mediaControls.airplayPlacard, mediaControls.controlsBar]");
+
+debug("");
+debug("Showing the PiP placard, hides the controls bar");
+mediaControls.showPlacard(mediaControls.pipPlacard);
+shouldBeTrue("mediaControls.showsPlacard");
+shouldBe("mediaControls.children", "[mediaControls.pipPlacard]");
+
+debug("");
+debug("Hide placard");
+mediaControls.hidePlacard();
+shouldBeFalse("mediaControls.showsPlacard");
+shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
+
+debug("");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsstartbuttonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Testing the MediaControls showsStartButton property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Default where showsStartButton = false
+PASS mediaControls.showsStartButton is false
+PASS mediaControls.children is [mediaControls.controlsBar]
+
+showsStartButton = true
+PASS mediaControls.showsStartButton is true
+PASS mediaControls.children is [mediaControls.startButton]
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsstartbuttonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<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/start-button.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/play-pause-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/skip-back-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/fullscreen-button.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/slider.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scrubber.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-label.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/time-control.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/media-controls.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing the <code>MediaControls</code> showsStartButton property.");
+
+iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
+
+const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
+
+debug("Default where showsStartButton = false");
+shouldBeFalse("mediaControls.showsStartButton");
+shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
+
+debug("");
+debug("showsStartButton = true");
+mediaControls.showsStartButton = true;
+shouldBeTrue("mediaControls.showsStartButton");
+shouldBe("mediaControls.children", "[mediaControls.startButton]");
+
+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 (207298 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 19:01:53 UTC (rev 207298)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-10-13 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] MediaControls base class
+ https://bugs.webkit.org/show_bug.cgi?id=163387
+ <rdar://problem/28753955>
+
+ Reviewed by Dean Jackson.
+
+ Introducing the new MediaControls class which will serve as a basis for all media controls.
+ We will introduce specific MediaControls subclasses for macOS inline, macOS fullscreen and
+ iOS inline in future patches.
+
+ Tests: 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
+
+ * Modules/modern-media-controls/controls/media-controls.css: Added.
+ (.media-controls,):
+ * Modules/modern-media-controls/controls/media-controls.js: Added.
+ (MediaControls.):
+ (MediaControls.prototype.get showsStartButton):
+ (MediaControls.prototype.set showsStartButton):
+ (MediaControls.prototype.get showsPlacard):
+ (MediaControls.prototype.showPlacard):
+ (MediaControls.prototype.hidePlacard):
+
</ins><span class="cx"> 2016-10-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Disable URLParser for non-Safari iOS and Mac apps for now
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,29 @@
</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.
+ */
+
+.media-controls,
+.media-controls > .controls-bar {
+ position: absolute;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (0 => 207299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-10-13 19:02:29 UTC (rev 207299)
</span><span class="lines">@@ -0,0 +1,89 @@
</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 MediaControls extends LayoutNode
+{
+
+ constructor({ width = 300, height = 150, layoutTraits = LayoutTraits.Unknown } = {})
+ {
+ super(`<div class="media-controls">`);
+
+ this.width = width;
+ this.height = height;
+ this.layoutTraits = layoutTraits;
+
+ this.startButton = new StartButton(this);
+
+ this.playPauseButton = new PlayPauseButton(this);
+ this.skipBackButton = new SkipBackButton(this);
+ this.airplayButton = new AirplayButton(this);
+ this.pipButton = new PiPButton(this);
+ this.fullscreenButton = new FullscreenButton(this);
+
+ this.timeControl = new TimeControl(this);
+
+ this.controlsBar = new LayoutItem({
+ element: `<div class="controls-bar">`,
+ layoutDelegate: this
+ });
+
+ this.airplayPlacard = new AirplayPlacard(this);
+ this.pipPlacard = new PiPPlacard(this);
+
+ this.showsStartButton = false;
+ }
+
+ // Public
+
+ get showsStartButton()
+ {
+ return this.children.includes(this.startButton);
+ }
+
+ set showsStartButton(showsStartButton)
+ {
+ this.children = [showsStartButton ? this.startButton : this.controlsBar];
+ }
+
+ get showsPlacard()
+ {
+ return this.children.includes(this.airplayPlacard) || this.children.includes(this.pipPlacard);
+ }
+
+ showPlacard(placard)
+ {
+ const children = [placard];
+ if (placard === this.airplayPlacard)
+ children.push(this.controlsBar);
+
+ this.children = children;
+ }
+
+ hidePlacard()
+ {
+ this.children = [this.controlsBar];
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>