<!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>[208242] 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/208242">208242</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-01 14:43:55 -0700 (Tue, 01 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Media Controller: Placard support
https://bugs.webkit.org/show_bug.cgi?id=163731
<rdar://problem/28869598>
Patch by Antoine Quint <graouts@apple.com> on 2016-11-01
Reviewed by Dean Jackson.
Source/WebCore:
We introduce the PlacardSupport class which brings support for showing the
appropriate placard when the media is played via AirPlay or in picture-in-picture.
Tests: media/modern-media-controls/placard-support/placard-support-airplay.html
media/modern-media-controls/placard-support/placard-support-pip.html
* Modules/modern-media-controls/js-files:
* Modules/modern-media-controls/media/media-controller.js:
(MediaController):
* Modules/modern-media-controls/media/placard-support.js: Added.
(PlacardSupport):
(PlacardSupport.prototype.get mediaEvents):
(PlacardSupport.prototype.handleEvent):
(PlacardSupport.prototype._updatePlacard):
* WebCore.xcodeproj/project.pbxproj:
LayoutTests:
Adding two new tests to check that the picture-in-picture and AirPlay placards are shown
based on the media presentation mode.
* media/modern-media-controls/placard-support/placard-support-airplay-expected.txt: Added.
* media/modern-media-controls/placard-support/placard-support-airplay.html: Added.
* media/modern-media-controls/placard-support/placard-support-pip-expected.txt: Added.
* media/modern-media-controls/placard-support/placard-support-pip.html: Added.
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsjsfiles">trunk/Source/WebCore/Modules/modern-media-controls/js-files</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs">trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/media/modern-media-controls/placard-support/</li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayexpectedtxt">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayhtml">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportpipexpectedtxt">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportpiphtml">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip.html</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediaplacardsupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/placard-support.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/LayoutTests/ChangeLog 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-11-01 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Media Controller: Placard support
+ https://bugs.webkit.org/show_bug.cgi?id=163731
+ <rdar://problem/28869598>
+
+ Reviewed by Dean Jackson.
+
+ Adding two new tests to check that the picture-in-picture and AirPlay placards are shown
+ based on the media presentation mode.
+
+ * media/modern-media-controls/placard-support/placard-support-airplay-expected.txt: Added.
+ * media/modern-media-controls/placard-support/placard-support-airplay.html: Added.
+ * media/modern-media-controls/placard-support/placard-support-pip-expected.txt: Added.
+ * media/modern-media-controls/placard-support/placard-support-pip.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2016-11-01 Ryan Haddad <ryanhaddad@apple.com>
+
+ Marking inspector/storage/domStorage-events.html as flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=164278
+
+ Unreviewed test gardening.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-11-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Percent-encode non-ASCII code points in hosts of URLs with unrecognized schemes
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt (0 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Testing the PlacardSupport behavior when playing media through AirPlay.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.showsPlacard is true
+PASS mediaController.controls.children.includes(mediaController.controls.airplayPlacard) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html (0 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<style type="text/css" media="screen">
+
+ video, #host {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+
+ video {
+ width: 800px;
+ height: 240px;
+ }
+
+</style>
+<video src="../../content/test.mp4" autoplay></video>
+<div id="host"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>PlacardSupport</code> behavior when playing media through AirPlay.");
+
+iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+
+if (window.internals) {
+ window.internals.settings.setAllowsAirPlayForMediaPlayback(true);
+ window.internals.setMediaElementRestrictions(media, "norestrictions");
+}
+
+media.addEventListener("webkitcurrentplaybacktargetiswirelesschanged", () => {
+ if (!media.paused && media.webkitCurrentPlaybackTargetIsWireless) {
+ shouldBeTrue("mediaController.controls.showsPlacard");
+ shouldBeTrue("mediaController.controls.children.includes(mediaController.controls.airplayPlacard)");
+
+ container.remove();
+ media.remove();
+ finishJSTest();
+ }
+});
+
+media.addEventListener("play", () => {
+ media.webkitShowPlaybackTargetPicker();
+ if (window.internals)
+ window.internals.setMockMediaPlaybackTargetPickerState("Sleepy TV", "DeviceAvailable");
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportpipexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip-expected.txt (0 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip-expected.txt 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Testing the PlacardSupport behavior when entering picture-in-picture.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.showsPlacard is true
+PASS mediaController.controls.children.includes(mediaController.controls.pipPlacard) is true
+PASS mediaController.controls.showsPlacard is false
+PASS mediaController.controls.children.includes(mediaController.controls.pipPlacard) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportpiphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip.html (0 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-pip.html 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<style type="text/css" media="screen">
+
+ video, #host {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+
+ video {
+ width: 800px;
+ height: 240px;
+ }
+
+</style>
+<video src="../../content/test.mp4" autoplay></video>
+<div id="host"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>PlacardSupport</code> behavior when entering picture-in-picture.");
+
+iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
+
+if (window.internals)
+ window.internals.settings.setAllowsPictureInPictureMediaPlayback(true);
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+
+const button = document.body.appendChild(document.createElement("button"));
+
+button.addEventListener("click", () => {
+ media.webkitSetPresentationMode(media.webkitPresentationMode == "inline" ? "picture-in-picture" : "inline");
+});
+
+media.addEventListener("webkitpresentationmodechanged", () => {
+ if (media.webkitPresentationMode == "picture-in-picture") {
+ shouldBeTrue("mediaController.controls.showsPlacard");
+ shouldBeTrue("mediaController.controls.children.includes(mediaController.controls.pipPlacard)");
+ clickButton();
+ } else {
+ shouldBeFalse("mediaController.controls.showsPlacard");
+ shouldBeFalse("mediaController.controls.children.includes(mediaController.controls.pipPlacard)");
+ container.remove();
+ media.remove();
+ finishJSTest();
+ }
+});
+
+media.addEventListener("play", clickButton);
+
+function clickButton() {
+ const bounds = button.getBoundingClientRect();
+ const centerX = bounds.left + bounds.width / 2;
+ const centerY = bounds.top + bounds.height / 2;
+
+ eventSender.mouseMoveTo(centerX, centerY);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -2741,3 +2741,6 @@
</span><span class="cx">
</span><span class="cx"> # Only Mac has implemented DictionaryLookup
</span><span class="cx"> fast/layers/prevent-hit-test-during-layout.html [ Skip ]
</span><ins>+
+# Internal APIs to test PiP and AirPlay are not available on iOS.
+media/modern-media-controls/placard-support [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -1450,3 +1450,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-click.html [ Skip ]
</span><span class="cx"> webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-drag.html [ Skip ]
</span><ins>+
+# Internal APIs to test PiP and AirPlay are not available on Yosemite.
+[ Yosemite ] media/modern-media-controls/placard-support [ Skip ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/Source/WebCore/ChangeLog 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-11-01 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Media Controller: Placard support
+ https://bugs.webkit.org/show_bug.cgi?id=163731
+ <rdar://problem/28869598>
+
+ Reviewed by Dean Jackson.
+
+ We introduce the PlacardSupport class which brings support for showing the
+ appropriate placard when the media is played via AirPlay or in picture-in-picture.
+
+ Tests: media/modern-media-controls/placard-support/placard-support-airplay.html
+ media/modern-media-controls/placard-support/placard-support-pip.html
+
+ * Modules/modern-media-controls/js-files:
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController):
+ * Modules/modern-media-controls/media/placard-support.js: Added.
+ (PlacardSupport):
+ (PlacardSupport.prototype.get mediaEvents):
+ (PlacardSupport.prototype.handleEvent):
+ (PlacardSupport.prototype._updatePlacard):
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2016-11-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ShowRenderTree: Add information about the type of the needsLayout bit.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsjsfiles"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> media/media-controller-support.js
</span><span class="cx"> media/elapsed-time-support.js
</span><span class="cx"> media/mute-support.js
</span><ins>+media/placard-support.js
</ins><span class="cx"> media/playback-support.js
</span><span class="cx"> media/remaining-time-support.js
</span><span class="cx"> media/scrubbing-support.js
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> new ElapsedTimeSupport(this);
</span><span class="cx"> new MuteSupport(this);
</span><ins>+ new PlacardSupport(this);
</ins><span class="cx"> new PlaybackSupport(this);
</span><span class="cx"> new RemainingTimeSupport(this);
</span><span class="cx"> new ScrubbingSupport(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediaplacardsupportjsfromrev208241trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/modern-media-controls/media/placard-support.js (from rev 208241, trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js) (0 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/placard-support.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/placard-support.js 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -0,0 +1,64 @@
</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 PlacardSupport extends MediaControllerSupport
+{
+
+ constructor(mediaController)
+ {
+ super(mediaController);
+ this._updatePlacard();
+ }
+
+ // Protected
+
+ get mediaEvents()
+ {
+ return ["webkitpresentationmodechanged", "webkitcurrentplaybacktargetiswirelesschanged"];
+ }
+
+ handleEvent(event)
+ {
+ this._updatePlacard();
+ }
+
+ // Private
+
+ _updatePlacard()
+ {
+ const controls = this.mediaController.controls;
+ if (controls.showsStartButton)
+ return;
+
+ const media = this.mediaController.media;
+ if (media.webkitPresentationMode === "picture-in-picture")
+ controls.showPlacard(controls.pipPlacard);
+ else if (media.webkitCurrentPlaybackTargetIsWireless)
+ controls.showPlacard(controls.airplayPlacard);
+ else
+ controls.hidePlacard();
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (208241 => 208242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-01 21:43:12 UTC (rev 208241)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-01 21:43:55 UTC (rev 208242)
</span><span class="lines">@@ -9871,6 +9871,7 @@
</span><span class="cx"> 7117445714BC34E200EE5FC8 /* SVGTextMetricsBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextMetricsBuilder.h; sourceTree = "<group>"; };
</span><span class="cx"> 7118FED215685CC60030B79A /* JSSVGViewSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGViewSpec.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7118FED315685CC60030B79A /* JSSVGViewSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGViewSpec.h; sourceTree = "<group>"; };
</span><ins>+ 711FB0751DC7688F00C4C708 /* placard-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "placard-support.js"; sourceTree = "<group>"; };
</ins><span class="cx"> 7134496B146941B300720312 /* SVGLengthContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLengthContext.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7134496C146941B300720312 /* SVGLengthContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLengthContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 713E70AF1733E8B300A22D00 /* plugIns.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = plugIns.js; sourceTree = "<group>"; };
</span><span class="lines">@@ -17881,6 +17882,7 @@
</span><span class="cx"> 7177E2461DB80D2F00919A0B /* media-controller-support.js */,
</span><span class="cx"> 71D02D921DB55C4E00DD5CF5 /* media-controller.js */,
</span><span class="cx"> 7177E2471DB80D2F00919A0B /* mute-support.js */,
</span><ins>+ 711FB0751DC7688F00C4C708 /* placard-support.js */,
</ins><span class="cx"> 71004B9D1DC1398800A52A38 /* playback-support.js */,
</span><span class="cx"> 71004B9B1DC1109300A52A38 /* remaining-time-support.js */,
</span><span class="cx"> 7157E3D11DC1EE4B0094550E /* scrubbing-support.js */,
</span></span></pre>
</div>
</div>
</body>
</html>