<!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>[200264] 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/200264">200264</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 14:29:01 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] AirPlay fails if target is set before AVPlayer has been created
https://bugs.webkit.org/show_bug.cgi?id=157147
<rdar://problem/24197592>
Reviewed by Jer Noble.
Source/WebCore:
Test: media/media-source/media-source-airplay.html
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Clear flag before calling
setShouldPlayToPlaybackTarget so it does the necessary setup.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isAvailable): Return false if the mock
MSE source has been registered.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Return 'not supported' if
isAvailable is false.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load): Fail if isAvailable is false.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless): Cleanup.
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::registered): Global accessor.
(WebCore::MockMediaPlayerMediaSource::isRegistered):
(WebCore::MockMediaPlayerMediaSource::registerMediaEngine): Set registered to true.
(WebCore::MockMediaPlayerMediaSource::setWirelessPlaybackTarget): New, remember the target.
(WebCore::MockMediaPlayerMediaSource::setShouldPlayToPlaybackTarget): New, remember the setting.
(WebCore::MockMediaPlayerMediaSource::isCurrentPlaybackTargetWireless):
* platform/mock/mediasource/MockMediaPlayerMediaSource.h:
* testing/Internals.cpp:
(WebCore::Internals::initializeMockMediaSource): Don't disable AVFoundation.
LayoutTests:
* media/media-source/media-source-airplay-expected.txt: Added.
* media/media-source/media-source-airplay.html: Added.
* platform/efl/TestExpectations: Skip Mac-only test.
* platform/gtk/TestExpectations: Ditto.
* platform/ios-simulator/TestExpectations: Ditto.
* platform/mac/TestExpectations: Skipped new tests on older versions of OS X.
* platform/win/TestExpectations: Skip Mac-only test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</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="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceairplayexpectedtxt">trunk/LayoutTests/media/media-source/media-source-airplay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceairplayhtml">trunk/LayoutTests/media/media-source/media-source-airplay.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/ChangeLog 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-29 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay fails if target is set before AVPlayer has been created
+ https://bugs.webkit.org/show_bug.cgi?id=157147
+ <rdar://problem/24197592>
+
+ Reviewed by Jer Noble.
+
+ * media/media-source/media-source-airplay-expected.txt: Added.
+ * media/media-source/media-source-airplay.html: Added.
+ * platform/efl/TestExpectations: Skip Mac-only test.
+ * platform/gtk/TestExpectations: Ditto.
+ * platform/ios-simulator/TestExpectations: Ditto.
+ * platform/mac/TestExpectations: Skipped new tests on older versions of OS X.
+ * platform/win/TestExpectations: Skip Mac-only test.
+
</ins><span class="cx"> 2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceairplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-airplay-expected.txt (0 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-airplay-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-airplay-expected.txt 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+
+** create a MediaSource object, set as video.src
+RUN(source = new MediaSource())
+RUN(source.addEventListener('sourceopen', startLoad))
+RUN(video.src = URL.createObjectURL(source))
+EVENT( webkitplaybacktargetavailabilitychanged ) : event.availability = 'not-available'
+
+** create a source buffer, add an init segment with 1 video track
+RUN(sourceBuffer = source.addSourceBuffer('video/mock; codecs="mock"'))
+RUN(init = makeAInit(100, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]))
+RUN(sourceBuffer.appendBuffer(init))
+
+EVENT(canplaythrough)
+
+** simulate choosing a device from the menu
+EVENT( webkitplaybacktargetavailabilitychanged ) : event.availability = 'available'
+
+** change video.src to one that supports AirPlay
+EXPECTED (video.webkitCurrentPlaybackTargetIsWireless == 'true') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceairplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-airplay.html (0 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-airplay.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-airplay.html 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Media engine change after selecting AirPlay targe</title>
+ <script src="mock-media-source.js"></script>
+ <script src="../media-file.js"></script>
+ <script src="../video-test.js"></script>
+ <script>
+
+ var sourceBuffer;
+ var requestLength = 200000;
+ var nextRequest = 0;
+ var totalLength = 100;
+ var previousAvailable = '';
+
+ if (window.internals) {
+ internals.initializeMockMediaSource();
+ internals.setMockMediaPlaybackTargetPickerEnabled(true);
+ internals.setMockMediaPlaybackTargetPickerState('', 'Unknown');
+ }
+
+ function start()
+ {
+ findMediaElement();
+
+ consoleWrite('** create a MediaSource object, set as video.src');
+ run(`source = new MediaSource()`);
+ run(`source.addEventListener('sourceopen', startLoad)`);
+ run(`video.src = URL.createObjectURL(source)`);
+
+ video.addEventListener('webkitcurrentplaybacktargetiswirelesschanged', currentTargetChanged, true);
+ video.addEventListener('webkitplaybacktargetavailabilitychanged', targetAvailabilityChanged, true);
+ waitForEventOnce('canplaythrough', canplaythrough);
+ }
+
+ function startLoad()
+ {
+ consoleWrite('<br>** create a source buffer, add an init segment with 1 video track');
+ run(`sourceBuffer = source.addSourceBuffer('video/mock; codecs="mock"')`);
+ sourceBuffer.addEventListener('update', sourceUpdated);
+ nextRequest = 0;
+
+ run(`init = makeAInit(100, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)])`);
+ run(`sourceBuffer.appendBuffer(init)`);
+ consoleWrite('');
+ }
+
+ function sourceUpdated()
+ {
+ if (nextRequest >= totalLength)
+ return;
+
+ sourceBuffer.appendBuffer(makeASample(nextRequest, nextRequest, 1, 1, SAMPLE_FLAG.SYNC));
+ ++nextRequest;
+ }
+
+ function canplaythrough()
+ {
+ consoleWrite('<br>** simulate choosing a device from the menu');
+ runWithKeyDown(function() {
+ if (window.internals) {
+ internals.setMockMediaPlaybackTargetPickerEnabled(true);
+ internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
+ video.webkitShowPlaybackTargetPicker();
+ }
+ });
+ }
+
+ function currentTargetChanged()
+ {
+ if (video.src.indexOf("/test.") > 0) {
+ testExpected("video.webkitCurrentPlaybackTargetIsWireless", true);
+ consoleWrite('');
+ endTest();
+ return;
+ }
+
+ consoleWrite('<br>** change video.src to one that supports AirPlay');
+ video.src = findMediaFile('video', '../content/test')
+ }
+
+ function targetAvailabilityChanged(event)
+ {
+ if (previousAvailable == event.availability)
+ return;
+
+ consoleWrite(`EVENT( ${event.type} ) : event.availability = '${event.availability}'`);
+ previousAvailable = event.availability;
+ }
+
+ </script>
+</head>
+<body onload="start()">
+ <video controls></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -2627,6 +2627,9 @@
</span><span class="cx"> webkit.org/b/156024 svg/zoom/page/zoom-svg-through-object-with-absolute-size.xhtml [ Failure ]
</span><span class="cx"> webkit.org/b/156024 svg/zoom/page/zoom-svg-through-object-with-percentage-size.xhtml [ Failure ]
</span><span class="cx">
</span><ins>+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/media-source/media-source-airplay.html [ Skip ]
+
</ins><span class="cx"> # Media tests have been failing since we bumped gstreamer ver.
</span><span class="cx"> webkit.org/b/156969 media/media-source/media-source-canplaythrough.html [ Timeout ]
</span><span class="cx"> webkit.org/b/156969 media/media-source/media-source-end-of-stream-buffered.html [ Timeout ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -1865,6 +1865,9 @@
</span><span class="cx"> webkit.org/b/123097 media/track/track-user-preferences.html [ Skip ]
</span><span class="cx"> webkit.org/b/121995 media/video-controls-captions-trackmenu-includes-enabled-track.html [ Failure ]
</span><span class="cx">
</span><ins>+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/media-source/media-source-airplay.html [ Skip ]
+
</ins><span class="cx"> Bug(GTK) http/tests/media/video-play-stall-seek.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> Bug(GTK) http/tests/misc/acid3.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -3002,6 +3002,9 @@
</span><span class="cx"> fast/forms/listbox-padding-clip-overlay.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/forms/listbox-padding-clip-selected.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><ins>+# MSE not enabled.
+media/media-source/media-source-airplay.html [ Skip ]
+
</ins><span class="cx"> # No focusring on iOS.
</span><span class="cx"> fast/images/image-map-outline-in-positioned-container.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> fast/images/image-map-outline-with-paint-root-offset.html [ Pass ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -1287,6 +1287,7 @@
</span><span class="cx"> # WIRELESS_PLAYBACK_TARGET not enabled on Yosemite.
</span><span class="cx"> [ Yosemite ] media/airplay-target-availability.html
</span><span class="cx"> [ Yosemite ] media/controls/airplay-picker.html
</span><ins>+[ Yosemite ] media/media-source/media-source-airplay.html
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/153086 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.3_encodeURI/S15.1.3.3_A2.4_T2.html [ Pass Crash ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -3337,6 +3337,7 @@
</span><span class="cx">
</span><span class="cx"> # WIRELESS_PLAYBACK_TARGET not enabled.
</span><span class="cx"> media/airplay-target-availability.html
</span><ins>+media/media-source/media-source-airplay.html
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/152411 http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always.html [ Failure ]
</span><span class="cx"> webkit.org/b/152411 http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/ChangeLog 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-04-29 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay fails if target is set before AVPlayer has been created
+ https://bugs.webkit.org/show_bug.cgi?id=157147
+ <rdar://problem/24197592>
+
+ Reviewed by Jer Noble.
+
+ Test: media/media-source/media-source-airplay.html
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Clear flag before calling
+ setShouldPlayToPlaybackTarget so it does the necessary setup.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isAvailable): Return false if the mock
+ MSE source has been registered.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Return 'not supported' if
+ isAvailable is false.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load): Fail if isAvailable is false.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless): Cleanup.
+
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+ (WebCore::registered): Global accessor.
+ (WebCore::MockMediaPlayerMediaSource::isRegistered):
+ (WebCore::MockMediaPlayerMediaSource::registerMediaEngine): Set registered to true.
+ (WebCore::MockMediaPlayerMediaSource::setWirelessPlaybackTarget): New, remember the target.
+ (WebCore::MockMediaPlayerMediaSource::setShouldPlayToPlaybackTarget): New, remember the setting.
+ (WebCore::MockMediaPlayerMediaSource::isCurrentPlaybackTargetWireless):
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.h:
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::initializeMockMediaSource): Don't disable AVFoundation.
+
</ins><span class="cx"> 2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -1036,8 +1036,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- if (m_shouldPlayToPlaybackTarget)
</del><ins>+ if (m_shouldPlayToPlaybackTarget) {
+ // Clear m_shouldPlayToPlaybackTarget so doesn't return without doing anything.
+ m_shouldPlayToPlaybackTarget = false;
</ins><span class="cx"> setShouldPlayToPlaybackTarget(true);
</span><ins>+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (player()->client().mediaPlayerIsVideo())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "MediaSourcePrivateAVFObjC.h"
</span><span class="cx"> #import "MediaSourcePrivateClient.h"
</span><span class="cx"> #import "MediaTimeAVFoundation.h"
</span><ins>+#import "MockMediaPlayerMediaSource.h"
</ins><span class="cx"> #import "PlatformClockCM.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import <AVFoundation/AVAsset.h>
</span><span class="lines">@@ -210,6 +211,9 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaSourceAVFObjC::isAvailable()
</span><span class="cx"> {
</span><ins>+ if (MockMediaPlayerMediaSource::isRegistered())
+ return false;
+
</ins><span class="cx"> return AVFoundationLibrary()
</span><span class="cx"> && isCoreMediaFrameworkAvailable()
</span><span class="cx"> && getAVStreamDataParserClass()
</span><span class="lines">@@ -241,6 +245,9 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer::SupportsType MediaPlayerPrivateMediaSourceAVFObjC::supportsType(const MediaEngineSupportParameters& parameters)
</span><span class="cx"> {
</span><ins>+ if (!isAvailable())
+ return MediaPlayer::IsNotSupported;
+
</ins><span class="cx"> // This engine does not support non-media-source sources.
</span><span class="cx"> if (!parameters.isMediaSource)
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="lines">@@ -275,6 +282,11 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(url);
</span><span class="cx">
</span><ins>+ if (!isAvailable()) {
+ setNetworkState(MediaPlayer::FormatError);
+ return;
+ }
+
</ins><span class="cx"> m_mediaSourcePrivate = MediaSourcePrivateAVFObjC::create(this, client);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,10 +870,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless() const
</span><span class="cx"> {
</span><del>- if (!m_playbackTarget)
- return false;
-
- return m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
</del><ins>+ return m_playbackTarget && m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -39,8 +39,20 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // MediaPlayer Enigne Support
</span><ins>+static bool& registered()
+{
+ static bool isRegistered = false;
+ return isRegistered;
+}
+
+bool MockMediaPlayerMediaSource::isRegistered()
+{
+ return registered();
+}
+
</ins><span class="cx"> void MockMediaPlayerMediaSource::registerMediaEngine(MediaEngineRegistrar registrar)
</span><span class="cx"> {
</span><ins>+ registered() = true;
</ins><span class="cx"> registrar([](MediaPlayer* player) { return std::make_unique<MockMediaPlayerMediaSource>(player); }, getSupportedTypes,
</span><span class="cx"> supportsType, 0, 0, 0, 0);
</span><span class="cx"> }
</span><span class="lines">@@ -293,6 +305,28 @@
</span><span class="cx"> return m_mediaSourcePrivate ? m_mediaSourcePrivate->totalFrameDelay() : MediaTime::zeroTime();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+void MockMediaPlayerMediaSource::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
+{
+ m_playbackTarget = WTFMove(target);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MockMediaPlayerMediaSource::setShouldPlayToPlaybackTarget(bool shouldPlayToTarget)
+{
+ if (shouldPlayToTarget == m_shouldPlayToTarget)
+ return;
+
+ m_shouldPlayToTarget = shouldPlayToTarget;
+
+ if (m_player)
+ m_player->currentPlaybackTargetIsWirelessChanged();
+}
+
+bool MockMediaPlayerMediaSource::isCurrentPlaybackTargetWireless() const
+{
+ return m_playbackTarget && m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
+}
</ins><span class="cx"> #endif
</span><ins>+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> WEBCORE_EXPORT static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx"> static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</span><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><ins>+ static bool isRegistered();
</ins><span class="cx">
</span><span class="cx"> virtual ~MockMediaPlayerMediaSource();
</span><span class="cx">
</span><span class="lines">@@ -86,6 +87,13 @@
</span><span class="cx"> unsigned long corruptedVideoFrames() override;
</span><span class="cx"> MediaTime totalFrameDelay() override;
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ bool isCurrentPlaybackTargetWireless() const override;
+ void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
+ void setShouldPlayToPlaybackTarget(bool) override;
+ bool wirelessVideoPlaybackDisabled() const override { return false; }
+#endif
+
</ins><span class="cx"> MediaPlayer* m_player;
</span><span class="cx"> RefPtr<MockMediaSourcePrivate> m_mediaSourcePrivate;
</span><span class="cx">
</span><span class="lines">@@ -93,6 +101,10 @@
</span><span class="cx"> MediaTime m_duration;
</span><span class="cx"> MediaPlayer::ReadyState m_readyState;
</span><span class="cx"> MediaPlayer::NetworkState m_networkState;
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ RefPtr<MediaPlaybackTarget> m_playbackTarget;
+ bool m_shouldPlayToTarget { false };
+#endif
</ins><span class="cx"> bool m_playing;
</span><span class="cx"> bool m_seekCompleted;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (200263 => 200264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-04-29 21:17:44 UTC (rev 200263)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-04-29 21:29:01 UTC (rev 200264)
</span><span class="lines">@@ -2741,9 +2741,6 @@
</span><span class="cx">
</span><span class="cx"> void Internals::initializeMockMediaSource()
</span><span class="cx"> {
</span><del>-#if USE(AVFOUNDATION)
- WebCore::Settings::setAVFoundationEnabled(false);
-#endif
</del><span class="cx"> MediaPlayerFactorySupport::callRegisterMediaEngine(MockMediaPlayerMediaSource::registerMediaEngine);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>