<!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>[195067] branches/safari-601-branch</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/195067">195067</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-14 11:19:28 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192200">r192200</a>. rdar://problem/24154288</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacTestExpectations">branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagerh">branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageChromeClienth">branches/safari-601-branch/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorepagePagecpp">branches/safari-601-branch/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorepagePageh">branches/safari-601-branch/Source/WebCore/page/Page.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargeth">branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTarget.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth">branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp">branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh">branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMach">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMacmm">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoretestingInternalscpp">branches/safari-601-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoretestingInternalsh">branches/safari-601-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoretestingInternalsidl">branches/safari-601-branch/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacChangeLog">branches/safari-601-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebCoreSupportWebChromeClienth">branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebCoreSupportWebChromeClientmm">branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickerh">branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm">branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebViewmm">branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebViewInternalh">branches/safari-601-branch/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2SharedWebCoreArgumentCoderscpp">branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebKit2SharedWebCoreArgumentCodersh">branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">branches/safari-601-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessWebPageProxymessagesin">branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockcpp">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockh">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192200. rdar://problem/24154288
+
+ 2015-11-09 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Add a mock AppleTV device for testing
+ https://bugs.webkit.org/show_bug.cgi?id=148912
+ <rdar://problem/22596272>
+
+ Reviewed by Tim Horton.
+
+ * media/controls/airplay-picker-expected.txt: Updated.
+ * media/controls/airplay-picker.html: Test button state when there is a device available.
+
+ * media/controls/controls-test-helpers.js:
+ (ControlsTest.prototype.stateForControlsElement): Add an optional parameter to force the flushed
+ state to be flushed.
+ (ControlsTest.prototype.contains): New.
+ (ControlsTest.prototype.doesNotContain): Ditto.
+
+ * platform/mac/TestExpectations: Skipped new tests on older versions of OS X.
+
</ins><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194927. rdar://problem/24101254
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1373,6 +1373,11 @@
</span><span class="cx"> webkit.org/b/149774 css3/font-variant-font-face-all.html [ Pass Failure ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149774 css3/font-variant-font-face-override.html [ Pass Failure ImageOnlyFailure ]
</span><span class="cx">
</span><ins>+# AppleTV not supported on Mavericks or Yosemite
+[ Mavericks Yosemite ] media/controls/airplay-picker.html
+
+webkit.org/b/150956 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html [ Pass Timeout ]
+
</ins><span class="cx"> # Yosemite and El Capitan do not support font feature coverage queries.
</span><span class="cx"> [ Yosemite ElCapitan ] css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span><span class="cx"> [ Yosemite ElCapitan ] css3/font-variant-petite-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1,5 +1,134 @@
</span><span class="cx"> 2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192200. rdar://problem/24154288
+
+ 2015-11-09 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Add a mock AppleTV device for testing
+ https://bugs.webkit.org/show_bug.cgi?id=148912
+ <rdar://problem/22596272>
+
+ Reviewed by Tim Horton.
+
+ No new tests, updated media/controls/airplay-picker.html.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::setMockMediaPlaybackTargetPickerEnabled): New, enable or disable
+ the mock picker.
+ (WebCore::WebMediaSessionManager::setMockMediaPlaybackTargetPickerState): New, set mock picker state.
+ (WebCore::WebMediaSessionManager::mockPicker): New.
+ (WebCore::WebMediaSessionManager::targetPicker): Return the platform or mock picker, as per settings.
+ (WebCore::webMediaSessionManagerOverride): Deleted.
+ (WebCore::WebMediaSessionManager::shared): Deleted.
+ (WebCore::WebMediaSessionManager::setWebMediaSessionManagerOverride): Deleted.
+ * Modules/mediasession/WebMediaSessionManager.h:
+
+ * WebCore.xcodeproj/project.pbxproj: Add MediaPlaybackTargetPickerMock.* and MediaPlaybackTargetMock.*.
+
+ * page/ChromeClient.h: add setMockMediaPlaybackTargetPickerEnabled and setMockMediaPlaybackTargetPickerState.
+
+ * page/Page.cpp:
+ (WebCore::Page::playbackTargetPickerClientStateDidChange):
+ (WebCore::Page::setMockMediaPlaybackTargetPickerEnabled): New.
+ (WebCore::Page::setMockMediaPlaybackTargetPickerState): New.
+ (WebCore::Page::setPlaybackTarget):
+ * page/Page.h:
+
+ * platform/graphics/MediaPlaybackTarget.h:
+ (WebCore::noMediaPlaybackTargetContext):
+ (WebCore::MediaPlaybackTarget::~MediaPlaybackTarget):
+ (WebCore::MediaPlaybackTarget::deviceName):
+ (WebCore::MediaPlaybackTarget::MediaPlaybackTarget):
+
+ * platform/graphics/MediaPlaybackTargetContext.h: Make a class instead of a struct.
+ (WebCore::MediaPlaybackTargetContext::MediaPlaybackTargetContext):
+ (WebCore::MediaPlaybackTargetContext::type):
+ (WebCore::MediaPlaybackTargetContext::mockDeviceName):
+ (WebCore::MediaPlaybackTargetContext::mockState):
+ (WebCore::MediaPlaybackTargetContext::avOutputContext):
+ (WebCore::MediaPlaybackTargetContext::encodingRequiresPlatformData):
+
+ * platform/graphics/MediaPlaybackTargetPicker.cpp: Move much of the code from MediaPlaybackTargetMac.mm
+ here so it can be the base class.
+ (WebCore::MediaPlaybackTargetPicker::MediaPlaybackTargetPicker):
+ (WebCore::MediaPlaybackTargetPicker::~MediaPlaybackTargetPicker):
+ (WebCore::MediaPlaybackTargetPicker::pendingActionTimerFired):
+ (WebCore::MediaPlaybackTargetPicker::addPendingAction):
+ (WebCore::MediaPlaybackTargetPicker::showPlaybackTargetPicker):
+ * platform/graphics/MediaPlaybackTargetPicker.h:
+ (WebCore::MediaPlaybackTargetPicker::availableDevicesDidChange):
+ (WebCore::MediaPlaybackTargetPicker::currentDeviceDidChange):
+ (WebCore::MediaPlaybackTargetPicker::client):
+ (WebCore::MediaPlaybackTargetPicker::setClient):
+
+ * platform/graphics/avfoundation/MediaPlaybackTargetMac.h:
+ (WebCore::MediaPlaybackTargetMac::outputContext):
+ (WebCore::MediaPlaybackTargetMac::targetType): Deleted.
+ * platform/graphics/avfoundation/MediaPlaybackTargetMac.mm:
+ (WebCore::MediaPlaybackTargetMac::targetContext):
+ (WebCore::MediaPlaybackTargetMac::hasActiveRoute):
+ (WebCore::MediaPlaybackTargetMac::deviceName):
+
+ * platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp:
+ (WebCore::WebMediaSessionManager::shared): Renamed from platformManager.
+ (WebCore::WebMediaSessionManagerMac::platformPicker): Renamed from targetPicker.
+ (WebCore::WebMediaSessionManager::platformManager): Deleted.
+ (WebCore::WebMediaSessionManagerMac::targetPicker): Deleted.
+ * platform/graphics/avfoundation/WebMediaSessionManagerMac.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac):
+ (WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac):
+ (WebCore::MediaPlaybackTargetPickerMac::externalOutputDeviceAvailable):
+ (WebCore::MediaPlaybackTargetPickerMac::playbackTarget):
+ (WebCore::MediaPlaybackTargetPickerMac::devicePicker):
+ (WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker):
+ (WebCore::MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets):
+ (WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Deleted.
+ (WebCore::MediaPlaybackTargetPickerMac::availableDevicesDidChange): Deleted.
+ (WebCore::MediaPlaybackTargetPickerMac::addPendingAction): Deleted.
+ (WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Deleted.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless): Add support for
+ mock target.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessPlaybackTargetName): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Ditto.
+
+ * platform/mock/MediaPlaybackTargetMock.cpp: Added.
+ (WebCore::MediaPlaybackTargetMock::create):
+ (WebCore::MediaPlaybackTargetMock::MediaPlaybackTargetMock):
+ (WebCore::MediaPlaybackTargetMock::~MediaPlaybackTargetMock):
+ (WebCore::MediaPlaybackTargetMock::targetContext):
+ (WebCore::toMediaPlaybackTargetMock):
+ * platform/mock/MediaPlaybackTargetMock.h: Added.
+
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp: Added.
+ (WebCore::MediaPlaybackTargetPickerMock::create):
+ (WebCore::MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock):
+ (WebCore::MediaPlaybackTargetPickerMock::~MediaPlaybackTargetPickerMock):
+ (WebCore::MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable):
+ (WebCore::MediaPlaybackTargetPickerMock::playbackTarget):
+ (WebCore::MediaPlaybackTargetPickerMock::timerFired):
+ (WebCore::MediaPlaybackTargetPickerMock::showPlaybackTargetPicker):
+ (WebCore::MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets):
+ (WebCore::MediaPlaybackTargetPickerMock::stopMonitoringPlaybackTargets):
+ (WebCore::MediaPlaybackTargetPickerMock::invalidatePlaybackTargets):
+ (WebCore::MediaPlaybackTargetPickerMock::setState):
+ * platform/mock/MediaPlaybackTargetPickerMock.h: Added.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals):
+ (WebCore::Internals::setMockMediaPlaybackTargetPickerEnabled):
+ (WebCore::Internals::setMockMediaPlaybackTargetPickerState):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189135. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "MediaPlaybackTargetPickerMac.h"
</del><ins>+#include "MediaPlaybackTargetPickerMock.h"
</ins><span class="cx"> #include "WebMediaSessionManagerClient.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -89,25 +89,39 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static WebMediaSessionManager*& webMediaSessionManagerOverride()
</del><ins>+void WebMediaSessionManager::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
</ins><span class="cx"> {
</span><del>- static WebMediaSessionManager* override;
- return override;
</del><ins>+ LOG(Media, "WebMediaSessionManager::setMockMediaPlaybackTargetPickerEnabled - enabled = %i", (int)enabled);
+
+ if (m_mockPickerEnabled == enabled)
+ return;
+
+ m_mockPickerEnabled = enabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebMediaSessionManager& WebMediaSessionManager::shared()
</del><ins>+void WebMediaSessionManager::setMockMediaPlaybackTargetPickerState(const String& name, MediaPlaybackTargetContext::State state)
</ins><span class="cx"> {
</span><del>- if (WebMediaSessionManager* override = webMediaSessionManagerOverride())
- return *override;
</del><ins>+ LOG(Media, "WebMediaSessionManager::setMockMediaPlaybackTargetPickerState - name = %s, state = %i", name.utf8().data(), (int)state);
</ins><span class="cx">
</span><del>- return WebMediaSessionManager::platformManager();
</del><ins>+ mockPicker().setState(name, state);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMediaSessionManager::setWebMediaSessionManagerOverride(WebMediaSessionManager* manager)
</del><ins>+MediaPlaybackTargetPickerMock& WebMediaSessionManager::mockPicker()
</ins><span class="cx"> {
</span><del>- webMediaSessionManagerOverride() = manager;
</del><ins>+ if (!m_pickerOverride)
+ m_pickerOverride = MediaPlaybackTargetPickerMock::create(*this);
+
+ return *m_pickerOverride.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+WebCore::MediaPlaybackTargetPicker& WebMediaSessionManager::targetPicker()
+{
+ if (m_mockPickerEnabled)
+ return mockPicker();
+
+ return platformPicker();
+}
+
</ins><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><span class="cx"> : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
</span><span class="cx"> , m_watchdogTimer(RunLoop::current(), this, &WebMediaSessionManager::watchdogTimerFired)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#include "MediaPlaybackTargetContext.h"
</ins><span class="cx"> #include "MediaPlaybackTargetPicker.h"
</span><ins>+#include "MediaPlaybackTargetPickerMock.h"
</ins><span class="cx"> #include "MediaProducer.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="lines">@@ -46,8 +48,10 @@
</span><span class="cx"> public:
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static WebMediaSessionManager& shared();
</span><del>- WEBCORE_EXPORT static void setWebMediaSessionManagerOverride(WebMediaSessionManager*);
</del><span class="cx">
</span><ins>+ WEBCORE_EXPORT void setMockMediaPlaybackTargetPickerEnabled(bool);
+ WEBCORE_EXPORT void setMockMediaPlaybackTargetPickerState(const String&, MediaPlaybackTargetContext::State);
+
</ins><span class="cx"> WEBCORE_EXPORT uint64_t addPlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removePlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removeAllPlaybackTargetPickerClients(WebMediaSessionManagerClient&);
</span><span class="lines">@@ -58,11 +62,14 @@
</span><span class="cx"> WebMediaSessionManager();
</span><span class="cx"> virtual ~WebMediaSessionManager();
</span><span class="cx">
</span><del>- virtual WebCore::MediaPlaybackTargetPicker& targetPicker() = 0;
</del><ins>+ virtual WebCore::MediaPlaybackTargetPicker& platformPicker() = 0;
</ins><span class="cx"> static WebMediaSessionManager& platformManager();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span><ins>+ WebCore::MediaPlaybackTargetPicker& targetPicker();
+ WebCore::MediaPlaybackTargetPickerMock& mockPicker();
+
</ins><span class="cx"> // MediaPlaybackTargetPicker::Client
</span><span class="cx"> virtual void setPlaybackTarget(Ref<WebCore::MediaPlaybackTarget>&&) override;
</span><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) override;
</span><span class="lines">@@ -94,10 +101,12 @@
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<ClientState>> m_clientState;
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget;
</span><ins>+ std::unique_ptr<WebCore::MediaPlaybackTargetPickerMock> m_pickerOverride;
</ins><span class="cx"> ConfigurationTasks m_taskFlags { NoTask };
</span><span class="cx"> double m_currentWatchdogInterval { 0 };
</span><span class="cx"> bool m_externalOutputDeviceAvailable { false };
</span><span class="cx"> bool m_targetChanged { false };
</span><ins>+ bool m_mockPickerEnabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -204,6 +204,10 @@
</span><span class="cx"> 077AF14018F4AE400001ED61 /* SerializedPlatformRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */; };
</span><span class="cx"> 077AF14418F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */; };
</span><ins>+ 077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077B64101B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp */; };
+ 077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 077B64111B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077B64141B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp */; };
+ 077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 077B64151B95F703003E9AD5 /* MediaPlaybackTargetMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */; };
</span><span class="cx"> 0783228518013ED800999E0C /* MediaStreamAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 0783228318013ED800999E0C /* MediaStreamAudioSource.h */; };
</span><span class="cx"> 07846342145B151A00A58DF1 /* JSTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */; };
</span><span class="lines">@@ -7377,6 +7381,10 @@
</span><span class="cx"> 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentation.h; sourceTree = "<group>"; };
</span><span class="cx"> 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentationMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SerializedPlatformRepresentationMac.mm; sourceTree = "<group>"; };
</span><ins>+ 077B64101B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlaybackTargetPickerMock.cpp; sourceTree = "<group>"; };
+ 077B64111B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetPickerMock.h; sourceTree = "<group>"; };
+ 077B64141B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlaybackTargetMock.cpp; sourceTree = "<group>"; };
+ 077B64151B95F703003E9AD5 /* MediaPlaybackTargetMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetMock.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamAudioSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0783228318013ED800999E0C /* MediaStreamAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSource.h; sourceTree = "<group>"; };
</span><span class="cx"> 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackEvent.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16621,6 +16629,10 @@
</span><span class="cx"> 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */,
</span><span class="cx"> 073794DF19EE2D1B00E5A045 /* MediaConstraintsMock.cpp */,
</span><span class="cx"> 073794E019EE2D1B00E5A045 /* MediaConstraintsMock.h */,
</span><ins>+ 077B64141B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp */,
+ 077B64151B95F703003E9AD5 /* MediaPlaybackTargetMock.h */,
+ 077B64101B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp */,
+ 077B64111B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h */,
</ins><span class="cx"> 4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */,
</span><span class="cx"> 4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */,
</span><span class="cx"> AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */,
</span><span class="lines">@@ -25100,6 +25112,7 @@
</span><span class="cx"> A81369D0097374F600D74463 /* HTMLFormElement.h in Headers */,
</span><span class="cx"> A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */,
</span><span class="cx"> 14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */,
</span><ins>+ 077B64171B95F703003E9AD5 /* MediaPlaybackTargetMock.h in Headers */,
</ins><span class="cx"> 93E241FF0B2B4E4000C732A1 /* HTMLFrameOwnerElement.h in Headers */,
</span><span class="cx"> A871DE280A152AC800B12A68 /* HTMLFrameSetElement.h in Headers */,
</span><span class="cx"> A871DE2D0A152AC800B12A68 /* HTMLHeadElement.h in Headers */,
</span><span class="lines">@@ -25866,6 +25879,7 @@
</span><span class="cx"> 49C7B9941042D2D30009D447 /* JSWebGLBuffer.h in Headers */,
</span><span class="cx"> 7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */,
</span><span class="cx"> 7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */,
</span><ins>+ 077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */,
</ins><span class="cx"> 6E3FAD3914733F4000E42306 /* JSWebGLCompressedTextureS3TC.h in Headers */,
</span><span class="cx"> 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */,
</span><span class="cx"> BC2CBF4E140F1ABD003879BE /* JSWebGLContextEvent.h in Headers */,
</span><span class="lines">@@ -28815,6 +28829,7 @@
</span><span class="cx"> F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */,
</span><span class="cx"> 7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
</span><span class="cx"> F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
</span><ins>+ 077B64161B95F703003E9AD5 /* MediaPlaybackTargetMock.cpp in Sources */,
</ins><span class="cx"> 7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
</span><span class="cx"> 7A54857F14E02D51006AE05A /* InspectorHistory.cpp in Sources */,
</span><span class="cx"> 7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */,
</span><span class="lines">@@ -30544,6 +30559,7 @@
</span><span class="cx"> 070334D9145A006F008D8D45 /* TrackBase.cpp in Sources */,
</span><span class="cx"> 070334D31459FFAD008D8D45 /* TrackEvent.cpp in Sources */,
</span><span class="cx"> BE88E0C11715CE2600658D98 /* TrackListBase.cpp in Sources */,
</span><ins>+ 077B64121B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.cpp in Sources */,
</ins><span class="cx"> FFAC30FF184FB145008C4F1E /* TrailingObjects.cpp in Sources */,
</span><span class="cx"> 49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */,
</span><span class="cx"> 494BC40D12AEDD9E00743BD2 /* TransformationMatrixCA.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/ChromeClient.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/ChromeClient.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/page/ChromeClient.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -51,6 +51,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+#include "MediaPlaybackTargetContext.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #define NSResponder WAKResponder
</span><span class="lines">@@ -447,6 +451,8 @@
</span><span class="cx"> virtual void removePlaybackTargetPickerClient(uint64_t /*contextId*/) { }
</span><span class="cx"> virtual void showPlaybackTargetPicker(uint64_t /*contextId*/, const WebCore::IntPoint&, bool /* isVideo */) { }
</span><span class="cx"> virtual void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, MediaProducer::MediaStateFlags) { }
</span><ins>+ virtual void setMockMediaPlaybackTargetPickerEnabled(bool) { }
+ virtual void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/Page.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/Page.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/page/Page.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1710,6 +1710,16 @@
</span><span class="cx"> chrome().client().playbackTargetPickerClientStateDidChange(contextId, state);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ chrome().client().setMockMediaPlaybackTargetPickerEnabled(enabled);
+}
+
+void Page::setMockMediaPlaybackTargetPickerState(const String& name, MediaPlaybackTargetContext::State state)
+{
+ chrome().client().setMockMediaPlaybackTargetPickerState(name, state);
+}
+
</ins><span class="cx"> void Page::setPlaybackTarget(uint64_t contextId, Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/Page.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/Page.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/page/Page.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -58,6 +58,10 @@
</span><span class="cx"> #include "MediaEventTypes.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+#include "MediaPlaybackTargetContext.h"
+#endif
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx"> class Debugger;
</span><span class="cx"> }
</span><span class="lines">@@ -448,8 +452,10 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void addPlaybackTargetPickerClient(uint64_t);
</span><span class="cx"> void removePlaybackTargetPickerClient(uint64_t);
</span><del>- void showPlaybackTargetPicker(uint64_t, const WebCore::IntPoint&, bool);
</del><ins>+ void showPlaybackTargetPicker(uint64_t, const IntPoint&, bool);
</ins><span class="cx"> void playbackTargetPickerClientStateDidChange(uint64_t, MediaProducer::MediaStateFlags);
</span><ins>+ WEBCORE_EXPORT void setMockMediaPlaybackTargetPickerEnabled(bool);
+ WEBCORE_EXPORT void setMockMediaPlaybackTargetPickerState(const String&, MediaPlaybackTargetContext::State);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setPlaybackTarget(uint64_t, Ref<MediaPlaybackTarget>&&);
</span><span class="cx"> WEBCORE_EXPORT void playbackTargetAvailabilityDidChange(uint64_t, bool);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargeth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTarget.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -29,10 +29,17 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span><span class="cx"> #include "MediaPlaybackTargetContext.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const MediaPlaybackTargetContext& noMediaPlaybackTargetContext()
+{
+ static NeverDestroyed<MediaPlaybackTargetContext> context;
+ return context;
+}
+
</ins><span class="cx"> class MediaPlaybackTarget : public RefCounted<MediaPlaybackTarget> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaPlaybackTarget() { }
</span><span class="lines">@@ -40,11 +47,13 @@
</span><span class="cx"> enum TargetType {
</span><span class="cx"> None,
</span><span class="cx"> AVFoundation,
</span><ins>+ Mock,
</ins><span class="cx"> };
</span><span class="cx"> virtual TargetType targetType() const { return None; }
</span><span class="cx">
</span><del>- virtual const MediaPlaybackTargetContext& targetContext() const { return NoMediaPlaybackTargetContext; }
</del><ins>+ virtual const MediaPlaybackTargetContext& targetContext() const { return noMediaPlaybackTargetContext(); }
</ins><span class="cx"> virtual bool hasActiveRoute() const { return false; }
</span><ins>+ virtual String deviceName() const { return emptyString(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> MediaPlaybackTarget() { }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span><ins>+#include <wtf/text/WTFString.h>
+
</ins><span class="cx"> OBJC_CLASS AVOutputContext;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -37,22 +39,67 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct MediaPlaybackTargetContext {
-
- enum ContextType : int32_t {
</del><ins>+class MediaPlaybackTargetContext {
+public:
+ enum Type : int32_t {
</ins><span class="cx"> None,
</span><span class="cx"> AVOutputContextType,
</span><del>- } type;
</del><ins>+ MockType,
+ };
</ins><span class="cx">
</span><del>- union {
- AVOutputContext* avOutputContext;
- } context;
</del><ins>+ enum ContextState {
+ Unavailable = 0,
+ OutputDeviceAvailable = 1 << 0,
+ };
+ typedef unsigned State;
</ins><span class="cx">
</span><del>- bool encodingRequiresPlatformData() const { return type == AVOutputContextType; }
</del><ins>+ MediaPlaybackTargetContext()
+ : m_type(None)
+ {
+ }
+
+ MediaPlaybackTargetContext(AVOutputContext *outputContext)
+ : m_type(AVOutputContextType)
+ , m_outputContext(outputContext)
+ {
+ }
+
+ MediaPlaybackTargetContext(const String& name, State state)
+ : m_type(MockType)
+ , m_name(name)
+ , m_state(state)
+ {
+ }
+
+ Type type() const { return m_type; }
+
+ const String& mockDeviceName() const
+ {
+ ASSERT(m_type == MockType);
+ return m_name;
+ }
+
+ State mockState() const
+ {
+ ASSERT(m_type == MockType);
+ return m_state;
+ }
+
+ AVOutputContext *avOutputContext() const
+ {
+ ASSERT(m_type == AVOutputContextType);
+ return m_outputContext;
+ }
+
+ bool encodingRequiresPlatformData() const { return m_type == AVOutputContextType; }
+
+private:
+ Type m_type { None };
+ AVOutputContext *m_outputContext { nullptr };
+ String m_name;
+ State m_state { Unavailable };
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-const MediaPlaybackTargetContext NoMediaPlaybackTargetContext = { MediaPlaybackTargetContext::None, {nullptr} };
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -28,18 +28,48 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span><ins>+#include "Logging.h"
+#include "MediaPlaybackTarget.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const double pendingActionInterval = 1.0 / 10.0;
+
</ins><span class="cx"> MediaPlaybackTargetPicker::MediaPlaybackTargetPicker(Client& client)
</span><span class="cx"> : m_client(&client)
</span><ins>+ , m_pendingActionTimer(RunLoop::main(), this, &MediaPlaybackTargetPicker::pendingActionTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPicker::~MediaPlaybackTargetPicker()
</span><span class="cx"> {
</span><ins>+ m_pendingActionTimer.stop();
</ins><span class="cx"> m_client = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlaybackTargetPicker::pendingActionTimerFired()
+{
+ LOG(Media, "MediaPlaybackTargetPicker::pendingActionTimerFired - flags = 0x%x", m_pendingActionFlags);
+
+ PendingActionFlags pendingActions = m_pendingActionFlags;
+ m_pendingActionFlags = 0;
+
+ if (pendingActions & CurrentDeviceDidChange)
+ m_client->setPlaybackTarget(playbackTarget());
+
+ if (pendingActions & OutputDeviceAvailabilityChanged)
+ m_client->externalOutputDeviceAvailableDidChange(externalOutputDeviceAvailable());
+}
+
+void MediaPlaybackTargetPicker::addPendingAction(PendingActionFlags action)
+{
+ if (!m_client)
+ return;
+
+ m_pendingActionFlags |= action;
+ m_pendingActionTimer.startOneShot(pendingActionInterval);
+}
+
</ins><span class="cx"> void MediaPlaybackTargetPicker::showPlaybackTargetPicker(const FloatRect&, bool)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span><span class="cx"> #include <wtf/Ref.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,10 +56,30 @@
</span><span class="cx"> virtual void stopMonitoringPlaybackTargets();
</span><span class="cx"> virtual void invalidatePlaybackTargets();
</span><span class="cx">
</span><ins>+ void availableDevicesDidChange() { addPendingAction(OutputDeviceAvailabilityChanged); }
+ void currentDeviceDidChange() { addPendingAction(CurrentDeviceDidChange); }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit MediaPlaybackTargetPicker(Client&);
</span><span class="cx">
</span><ins>+ enum ActionType {
+ OutputDeviceAvailabilityChanged = 1 << 0,
+ CurrentDeviceDidChange = 1 << 1,
+ };
+ typedef unsigned PendingActionFlags;
+
+ void addPendingAction(PendingActionFlags);
+ void pendingActionTimerFired();
+ Client* client() const { return m_client; }
+ void setClient(Client* client) { m_client = client; }
+
+private:
+ virtual bool externalOutputDeviceAvailable() = 0;
+ virtual Ref<MediaPlaybackTarget> playbackTarget() = 0;
+
+ PendingActionFlags m_pendingActionFlags { 0 };
</ins><span class="cx"> Client* m_client;
</span><ins>+ RunLoop::Timer<MediaPlaybackTargetPicker> m_pendingActionTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMach"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -39,11 +39,13 @@
</span><span class="cx">
</span><span class="cx"> virtual ~MediaPlaybackTargetMac();
</span><span class="cx">
</span><del>- virtual TargetType targetType() const { return AVFoundation; }
</del><ins>+ TargetType targetType() const override { return AVFoundation; }
</ins><span class="cx">
</span><del>- virtual const MediaPlaybackTargetContext& targetContext() const;
- virtual bool hasActiveRoute() const;
</del><ins>+ const MediaPlaybackTargetContext& targetContext() const override;
+ bool hasActiveRoute() const override;
</ins><span class="cx">
</span><ins>+ String deviceName() const override;
+
</ins><span class="cx"> AVOutputContext *outputContext() const { return m_outputContext.get(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -51,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVOutputContext> m_outputContext;
</span><span class="cx"> mutable MediaPlaybackTargetContext m_context;
</span><ins>+ String m_deviceName;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetMac* toMediaPlaybackTargetMac(MediaPlaybackTarget*);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -54,9 +54,7 @@
</span><span class="cx">
</span><span class="cx"> const MediaPlaybackTargetContext& MediaPlaybackTargetMac::targetContext() const
</span><span class="cx"> {
</span><del>- m_context.type = MediaPlaybackTargetContext::AVOutputContextType;
- m_context.context.avOutputContext = m_outputContext.get();
-
</del><ins>+ m_context = MediaPlaybackTargetContext(m_outputContext.get());
</ins><span class="cx"> return m_context;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -65,7 +63,14 @@
</span><span class="cx"> return m_outputContext && m_outputContext.get().deviceName;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MediaPlaybackTargetMac::deviceName() const
+{
+ if (m_outputContext)
+ return m_outputContext.get().deviceName;
</ins><span class="cx">
</span><ins>+ return emptyString();
+}
+
</ins><span class="cx"> MediaPlaybackTargetMac* toMediaPlaybackTargetMac(MediaPlaybackTarget* rep)
</span><span class="cx"> {
</span><span class="cx"> return const_cast<MediaPlaybackTargetMac*>(toMediaPlaybackTargetMac(const_cast<const MediaPlaybackTarget*>(rep)));
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebMediaSessionManager& WebMediaSessionManager::platformManager()
</del><ins>+WebMediaSessionManager& WebMediaSessionManager::shared()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebMediaSessionManagerMac> sharedManager;
</span><span class="cx"> return sharedManager;
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::MediaPlaybackTargetPicker& WebMediaSessionManagerMac::targetPicker()
</del><ins>+WebCore::MediaPlaybackTargetPicker& WebMediaSessionManagerMac::platformPicker()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_targetPicker)
</span><span class="cx"> m_targetPicker = MediaPlaybackTargetPickerMac::create(*this);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> WebMediaSessionManagerMac();
</span><span class="cx"> virtual ~WebMediaSessionManagerMac();
</span><span class="cx">
</span><del>- virtual WebCore::MediaPlaybackTargetPicker& targetPicker();
</del><ins>+ virtual WebCore::MediaPlaybackTargetPicker& platformPicker();
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::MediaPlaybackTargetPicker> m_targetPicker;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaPlaybackTargetPicker.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><del>-#include <wtf/RunLoop.h>
</del><span class="cx">
</span><span class="cx"> OBJC_CLASS AVOutputDeviceMenuController;
</span><span class="cx"> OBJC_CLASS WebAVOutputDeviceMenuControllerHelper;
</span><span class="lines">@@ -49,27 +48,16 @@
</span><span class="cx"> void stopMonitoringPlaybackTargets() override;
</span><span class="cx"> void invalidatePlaybackTargets() override;
</span><span class="cx">
</span><del>- void availableDevicesDidChange();
- void currentDeviceDidChange();
-
</del><span class="cx"> private:
</span><span class="cx"> explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
</span><span class="cx">
</span><ins>+ bool externalOutputDeviceAvailable() override;
+ Ref<MediaPlaybackTarget> playbackTarget() override;
+
</ins><span class="cx"> AVOutputDeviceMenuController *devicePicker();
</span><span class="cx">
</span><del>- enum ActionType {
- OutputDeviceAvailabilityChanged = 1 << 0,
- CurrentDeviceDidChange = 1 << 1,
- };
- typedef unsigned PendingActionFlags;
-
- void addPendingAction(PendingActionFlags);
- void pendingActionTimerFired();
-
- PendingActionFlags m_pendingActionFlags { 0 };
</del><span class="cx"> RetainPtr<AVOutputDeviceMenuController> m_outputDeviceMenuController;
</span><span class="cx"> RetainPtr<WebAVOutputDeviceMenuControllerHelper> m_outputDeviceMenuControllerDelegate;
</span><del>- RunLoop::Timer<MediaPlaybackTargetPickerMac> m_pendingActionTimer;
</del><span class="cx"> bool m_showingMenu { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -67,8 +67,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const double pendingActionInterval = 1.0 / 10.0;
-
</del><span class="cx"> std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> {
</span><span class="cx"> return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));
</span><span class="lines">@@ -77,47 +75,25 @@
</span><span class="cx"> MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> : MediaPlaybackTargetPicker(client)
</span><span class="cx"> , m_outputDeviceMenuControllerDelegate(adoptNS([[WebAVOutputDeviceMenuControllerHelper alloc] initWithCallback:this]))
</span><del>- , m_pendingActionTimer(RunLoop::main(), this, &MediaPlaybackTargetPickerMac::pendingActionTimerFired)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac()
</span><span class="cx"> {
</span><del>- m_client = nullptr;
- m_pendingActionTimer.stop();
</del><ins>+ setClient(nullptr);
</ins><span class="cx"> [m_outputDeviceMenuControllerDelegate clearCallback];
</span><del>-
- stopMonitoringPlaybackTargets();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlaybackTargetPickerMac::pendingActionTimerFired()
</del><ins>+bool MediaPlaybackTargetPickerMac::externalOutputDeviceAvailable()
</ins><span class="cx"> {
</span><del>- LOG(Media, "MediaPlaybackTargetPickerMac::pendingActionTimerFired - flags = 0x%x", m_pendingActionFlags);
-
- if (!m_client)
- return;
-
- PendingActionFlags pendingActions = m_pendingActionFlags;
- m_pendingActionFlags = 0;
-
- if (pendingActions & CurrentDeviceDidChange) {
- AVOutputContext* context = m_outputDeviceMenuController ? [m_outputDeviceMenuController.get() outputContext] : nullptr;
- m_client->setPlaybackTarget(WebCore::MediaPlaybackTargetMac::create(context));
- }
-
- if (pendingActions & OutputDeviceAvailabilityChanged)
- m_client->externalOutputDeviceAvailableDidChange(devicePicker().externalOutputDeviceAvailable);
-
</del><ins>+ return devicePicker().externalOutputDeviceAvailable;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlaybackTargetPickerMac::availableDevicesDidChange()
</del><ins>+Ref<MediaPlaybackTarget> MediaPlaybackTargetPickerMac::playbackTarget()
</ins><span class="cx"> {
</span><del>- LOG(Media, "MediaPlaybackTargetPickerMac::availableDevicesDidChange - available = %i", (int)devicePicker().externalOutputDeviceAvailable);
</del><ins>+ AVOutputContext* context = m_outputDeviceMenuController ? [m_outputDeviceMenuController.get() outputContext] : nullptr;
</ins><span class="cx">
</span><del>- if (!m_client)
- return;
-
- addPendingAction(OutputDeviceAvailabilityChanged);
</del><ins>+ return WebCore::MediaPlaybackTargetMac::create(context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVOutputDeviceMenuControllerType *MediaPlaybackTargetPickerMac::devicePicker()
</span><span class="lines">@@ -145,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::showPlaybackTargetPicker(const FloatRect& location, bool checkActiveRoute)
</span><span class="cx"> {
</span><del>- if (!m_client || m_showingMenu)
</del><ins>+ if (!client() || m_showingMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMac::showPlaybackTargetPicker - checkActiveRoute = %i", (int)checkActiveRoute);
</span><span class="lines">@@ -162,22 +138,6 @@
</span><span class="cx"> m_showingMenu = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlaybackTargetPickerMac::addPendingAction(PendingActionFlags action)
-{
- m_pendingActionFlags |= action;
- m_pendingActionTimer.startOneShot(pendingActionInterval);
-}
-
-void MediaPlaybackTargetPickerMac::currentDeviceDidChange()
-{
- LOG(Media, "MediaPlaybackTargetPickerMac::currentDeviceDidChange");
-
- if (!m_client)
- return;
-
- addPendingAction(CurrentDeviceDidChange);
-}
-
</del><span class="cx"> void MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets");
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && USE(AVFOUNDATION)
</span><span class="cx">
</span><ins>+#include "MediaPlaybackTarget.h"
</ins><span class="cx"> #include "MediaPlayerPrivateAVFoundation.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="lines">@@ -64,7 +65,6 @@
</span><span class="cx"> class AudioTrackPrivateAVFObjC;
</span><span class="cx"> class InbandMetadataTextTrackPrivateAVF;
</span><span class="cx"> class InbandTextTrackPrivateAVFObjC;
</span><del>-class MediaPlaybackTarget;
</del><span class="cx"> class MediaSelectionGroupAVFObjC;
</span><span class="cx"> class VideoTrackPrivateAVFObjC;
</span><span class="cx"> class WebCoreAVFResourceLoader;
</span><span class="lines">@@ -362,6 +362,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> RetainPtr<AVOutputContext> m_outputContext;
</span><ins>+ RefPtr<MediaPlaybackTarget> m_playbackTarget { nullptr };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> mutable RetainPtr<NSArray> m_cachedSeekableRanges;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #import "URL.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaPlaybackTargetMac.h"
</span><ins>+#import "MediaPlaybackTargetMock.h"
</ins><span class="cx"> #import "MediaSelectionGroupAVFObjC.h"
</span><span class="cx"> #import "MediaTimeAVFoundation.h"
</span><span class="cx"> #import "PlatformTimeRanges.h"
</span><span class="lines">@@ -2739,10 +2740,19 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless() const
</span><span class="cx"> {
</span><del>- if (!m_avPlayer)
- return false;
</del><ins>+ bool wirelessTarget = false;
</ins><span class="cx">
</span><del>- bool wirelessTarget = m_avPlayer.get().externalPlaybackActive;
</del><ins>+#if !PLATFORM(IOS)
+ if (m_playbackTarget) {
+ if (m_playbackTarget->targetType() == MediaPlaybackTarget::AVFoundation)
+ wirelessTarget = m_avPlayer && m_avPlayer.get().externalPlaybackActive;
+ else
+ wirelessTarget = m_shouldPlayToPlaybackTarget && m_playbackTarget->hasActiveRoute();
+ }
+#else
+ wirelessTarget = m_avPlayer && m_avPlayer.get().externalPlaybackActive;
+#endif
+
</ins><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless(%p) - returning %s", this, boolString(wirelessTarget));
</span><span class="cx">
</span><span class="cx"> return wirelessTarget;
</span><span class="lines">@@ -2778,8 +2788,8 @@
</span><span class="cx">
</span><span class="cx"> String wirelessTargetName;
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- if (m_outputContext)
- wirelessTargetName = m_outputContext.get().deviceName;
</del><ins>+ if (m_playbackTarget)
+ wirelessTargetName = m_playbackTarget->deviceName();
</ins><span class="cx"> #else
</span><span class="cx"> wirelessTargetName = wkExernalDeviceDisplayNameForPlayer(m_avPlayer.get());
</span><span class="cx"> #endif
</span><span class="lines">@@ -2814,31 +2824,56 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><del>- MediaPlaybackTargetMac* macTarget = toMediaPlaybackTargetMac(&target.get());
</del><ins>+ m_playbackTarget = WTF::move(target);
</ins><span class="cx">
</span><del>- m_outputContext = macTarget->outputContext();
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(%p) - target = %p, device name = %s", this, m_outputContext.get(), [m_outputContext.get().deviceName UTF8String]);
</del><ins>+ m_outputContext = m_playbackTarget->targetType() == MediaPlaybackTarget::AVFoundation ? toMediaPlaybackTargetMac(m_playbackTarget.get())->outputContext() : nullptr;
</ins><span class="cx">
</span><del>- if (!m_outputContext || !m_outputContext.get().deviceName)
</del><ins>+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(%p) - target = %p, device name = %s", this, m_outputContext.get(), m_playbackTarget->deviceName().utf8().data());
+
+ if (!m_playbackTarget->hasActiveRoute())
</ins><span class="cx"> setShouldPlayToPlaybackTarget(false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(bool shouldPlay)
</span><span class="cx"> {
</span><ins>+ if (m_shouldPlayToPlaybackTarget == shouldPlay)
+ return;
+
</ins><span class="cx"> m_shouldPlayToPlaybackTarget = shouldPlay;
</span><span class="cx">
</span><del>- AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
-
- if (!m_avPlayer)
</del><ins>+ if (!m_playbackTarget)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
- if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
</del><ins>+ if (m_playbackTarget->targetType() == MediaPlaybackTarget::AVFoundation) {
+ AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
+
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
+
+ if (!m_avPlayer)
+ return;
+
+ RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
+ if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
+ return;
+
+ setDelayCallbacks(true);
+ m_avPlayer.get().outputContext = newContext;
+ setDelayCallbacks(false);
+
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ ASSERT(m_playbackTarget->targetType() == MediaPlaybackTarget::Mock);
+
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = {Mock}, shouldPlay = %s", this, boolString(shouldPlay));
+
</ins><span class="cx"> setDelayCallbacks(true);
</span><del>- m_avPlayer.get().outputContext = newContext;
</del><ins>+ auto weakThis = createWeakPtr();
+ scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification([weakThis] {
+ if (!weakThis)
+ return;
+ weakThis->playbackTargetIsWirelessDidChange();
+ }));
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockcppfromrev195066branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMacmm"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp (from rev 195066, branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm) (0 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp (rev 0)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "config.h"
+#include "MediaPlaybackTargetMock.h"
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+namespace WebCore {
+
+Ref<MediaPlaybackTarget> MediaPlaybackTargetMock::create(const String& name, MediaPlaybackTargetContext::State state)
+{
+ return adoptRef(*new MediaPlaybackTargetMock(name, state));
+}
+
+MediaPlaybackTargetMock::MediaPlaybackTargetMock(const String& name, MediaPlaybackTargetContext::State state)
+ : MediaPlaybackTarget()
+ , m_name(name)
+ , m_state(state)
+{
+}
+
+MediaPlaybackTargetMock::~MediaPlaybackTargetMock()
+{
+}
+
+const MediaPlaybackTargetContext& MediaPlaybackTargetMock::targetContext() const
+{
+ m_context = MediaPlaybackTargetContext(m_name, m_state);
+ return m_context;
+}
+
+MediaPlaybackTargetMock* toMediaPlaybackTargetMock(MediaPlaybackTarget* rep)
+{
+ return const_cast<MediaPlaybackTargetMock*>(toMediaPlaybackTargetMock(const_cast<const MediaPlaybackTarget*>(rep)));
+}
+
+const MediaPlaybackTargetMock* toMediaPlaybackTargetMock(const MediaPlaybackTarget* rep)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(rep->targetType() == MediaPlaybackTarget::Mock);
+ return static_cast<const MediaPlaybackTargetMock*>(rep);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockhfromrev195066branchessafari601branchSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMach"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h (from rev 195066, branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h) (0 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h (rev 0)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef MediaPlaybackTargetMock_h
+#define MediaPlaybackTargetMock_h
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#include "MediaPlaybackTarget.h"
+#include "MediaPlaybackTargetContext.h"
+#include <wtf/RetainPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class MediaPlaybackTargetMock : public MediaPlaybackTarget {
+public:
+ WEBCORE_EXPORT static Ref<MediaPlaybackTarget> create(const String&, MediaPlaybackTargetContext::State);
+
+ virtual ~MediaPlaybackTargetMock();
+
+ TargetType targetType() const override { return Mock; }
+
+ const MediaPlaybackTargetContext& targetContext() const override;
+
+ bool hasActiveRoute() const override { return !m_name.isEmpty(); }
+
+ String deviceName() const override { return m_name; }
+
+ MediaPlaybackTargetContext::State state() const;
+
+protected:
+ MediaPlaybackTargetMock(const String&, MediaPlaybackTargetContext::State);
+
+ String m_name;
+ MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
+ mutable MediaPlaybackTargetContext m_context;
+};
+
+MediaPlaybackTargetMock* toMediaPlaybackTargetMock(MediaPlaybackTarget*);
+const MediaPlaybackTargetMock* toMediaPlaybackTargetMock(const MediaPlaybackTarget*);
+
+}
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#endif
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (0 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (rev 0)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -0,0 +1,128 @@
</span><ins>+/*
+ * Copyright (C) 2015 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#include "config.h"
+#include "MediaPlaybackTargetPickerMock.h"
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#include "Logging.h"
+#include <WebCore/FloatRect.h>
+#include <WebCore/MediaPlaybackTargetMock.h>
+#include <WebCore/WebMediaSessionManager.h>
+
+using namespace WebCore;
+
+namespace WebCore {
+
+static const double timerInterval = 1.0 / 10.0;
+
+std::unique_ptr<MediaPlaybackTargetPickerMock> MediaPlaybackTargetPickerMock::create(MediaPlaybackTargetPicker::Client& client)
+{
+ return std::unique_ptr<MediaPlaybackTargetPickerMock>(new MediaPlaybackTargetPickerMock(client));
+}
+
+MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client)
+ : MediaPlaybackTargetPicker(client)
+ , m_timer(RunLoop::main(), this, &MediaPlaybackTargetPickerMock::timerFired)
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock");
+}
+
+MediaPlaybackTargetPickerMock::~MediaPlaybackTargetPickerMock()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::~MediaPlaybackTargetPickerMock");
+ setClient(nullptr);
+}
+
+bool MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable");
+ return m_state & MediaPlaybackTargetContext::OutputDeviceAvailable;
+}
+
+Ref<MediaPlaybackTarget> MediaPlaybackTargetPickerMock::playbackTarget()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::playbackTarget");
+ return WebCore::MediaPlaybackTargetMock::create(m_deviceName, m_state);
+}
+
+void MediaPlaybackTargetPickerMock::timerFired()
+{
+ m_showingMenu = false;
+ currentDeviceDidChange();
+}
+
+void MediaPlaybackTargetPickerMock::showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute)
+{
+ if (!client() || m_showingMenu)
+ return;
+
+ LOG(Media, "MediaPlaybackTargetPickerMock::showPlaybackTargetPicker - checkActiveRoute = %i", (int)checkActiveRoute);
+
+ m_showingMenu = true;
+ m_timer.startOneShot(timerInterval);
+}
+
+void MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets");
+
+ if (m_state & MediaPlaybackTargetContext::OutputDeviceAvailable)
+ availableDevicesDidChange();
+
+ if (!m_deviceName.isEmpty())
+ currentDeviceDidChange();
+}
+
+void MediaPlaybackTargetPickerMock::stopMonitoringPlaybackTargets()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::stopMonitoringPlaybackTargets");
+}
+
+void MediaPlaybackTargetPickerMock::invalidatePlaybackTargets()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::invalidatePlaybackTargets");
+ setState(WTF::emptyString(), MediaPlaybackTargetContext::Unavailable);
+}
+
+void MediaPlaybackTargetPickerMock::setState(const String& deviceName, MediaPlaybackTargetContext::State state)
+{
+ LOG(Media, "MediaPlaybackTargetPickerMock::setState - name = %s, state = 0x%x", deviceName.utf8().data(), (unsigned)state);
+
+ if (deviceName != m_deviceName) {
+ m_deviceName = deviceName;
+ currentDeviceDidChange();
+ }
+
+ if (m_state != state) {
+ m_state = state;
+ availableDevicesDidChange();
+ }
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockhfromrev195066branchessafari601branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (from rev 195066, branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h) (0 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (rev 0)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2015 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#ifndef MediaPlaybackTargetPickerMock_h
+#define MediaPlaybackTargetPickerMock_h
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#include "MediaPlaybackTargetContext.h"
+#include "MediaPlaybackTargetPicker.h"
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class MediaPlaybackTargetPickerMock final : public MediaPlaybackTargetPicker {
+ WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMock);
+public:
+ virtual ~MediaPlaybackTargetPickerMock();
+
+ WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMock> create(MediaPlaybackTargetPicker::Client&);
+
+ void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
+ void startingMonitoringPlaybackTargets() override;
+ void stopMonitoringPlaybackTargets() override;
+ void invalidatePlaybackTargets() override;
+
+ void setState(const String&, MediaPlaybackTargetContext::State);
+
+private:
+ explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
+
+ bool externalOutputDeviceAvailable() override;
+ Ref<MediaPlaybackTarget> playbackTarget() override;
+
+ void timerFired();
+
+ String m_deviceName;
+ RunLoop::Timer<MediaPlaybackTargetPickerMock> m_timer;
+ MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
+ bool m_showingMenu { false };
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+
+#endif // WebContextMenuProxyMac_h
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/testing/Internals.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -190,6 +190,10 @@
</span><span class="cx"> #include "AudioContext.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+#include "MediaPlaybackTargetContext.h"
+#endif
+
</ins><span class="cx"> using JSC::CodeBlock;
</span><span class="cx"> using JSC::FunctionExecutable;
</span><span class="cx"> using JSC::JSFunction;
</span><span class="lines">@@ -351,6 +355,11 @@
</span><span class="cx"> enableMockRTCPeerConnectionHandler();
</span><span class="cx"> WebCore::provideUserMediaTo(document->page(), new UserMediaClientMock());
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (document && document->page())
+ document->page()->setMockMediaPlaybackTargetPickerEnabled(true);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Document* Internals::contextDocument() const
</span><span class="lines">@@ -2795,7 +2804,34 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+void Internals::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ Page* page = contextDocument()->frame()->page();
+ ASSERT(page);
</ins><span class="cx">
</span><ins>+ page->setMockMediaPlaybackTargetPickerEnabled(enabled);
+}
+
+void Internals::setMockMediaPlaybackTargetPickerState(const String& deviceName, const String& deviceState, ExceptionCode& ec)
+{
+ Page* page = contextDocument()->frame()->page();
+ ASSERT(page);
+
+ MediaPlaybackTargetContext::State state = MediaPlaybackTargetContext::Unavailable;
+
+ if (equalIgnoringCase(deviceState, "DeviceAvailable"))
+ state = MediaPlaybackTargetContext::OutputDeviceAvailable;
+ else {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+
+ page->setMockMediaPlaybackTargetPickerState(deviceName, state);
+}
+#endif
+
+
</ins><span class="cx"> void Internals::installMockPageOverlay(const String& overlayType, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/testing/Internals.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/testing/Internals.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/testing/Internals.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -391,6 +391,11 @@
</span><span class="cx"> bool elementIsBlockingDisplaySleep(Element*) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ void setMockMediaPlaybackTargetPickerEnabled(bool);
+ void setMockMediaPlaybackTargetPickerState(const String& deviceName, const String& deviceState, ExceptionCode&);
+#endif
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> void setAudioContextRestrictions(AudioContext*, const String& restrictions, ExceptionCode&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/testing/Internals.idl (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/testing/Internals.idl 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebCore/testing/Internals.idl 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -357,7 +357,9 @@
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void setMediaElementRestrictions(HTMLMediaElement element, DOMString restrictions);
</span><span class="cx"> [Conditional=WEB_AUDIO, RaisesException] void setAudioContextRestrictions(AudioContext context, DOMString restrictions);
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void postRemoteControlCommand(DOMString command);
</span><del>-
</del><ins>+ [Conditional=WIRELESS_PLAYBACK_TARGET] void setMockMediaPlaybackTargetPickerEnabled(boolean enabled);
+ [Conditional=WIRELESS_PLAYBACK_TARGET, RaisesException] void setMockMediaPlaybackTargetPickerState(DOMString deviceName, DOMString deviceState);
+
</ins><span class="cx"> [Conditional=VIDEO] void simulateSystemSleep();
</span><span class="cx"> [Conditional=VIDEO] void simulateSystemWake();
</span><span class="cx"> [Conditional=VIDEO] boolean elementIsBlockingDisplaySleep(Element element);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192200. rdar://problem/24154288
+
+ 2015-11-09 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Add a mock AppleTV device for testing
+ https://bugs.webkit.org/show_bug.cgi?id=148912
+ <rdar://problem/22596272>
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::setMockMediaPlaybackTargetPickerEnabled): New.
+ (WebChromeClient::setMockMediaPlaybackTargetPickerState): Ditto.
+
+ * WebView/WebMediaPlaybackTargetPicker.h:
+ * WebView/WebMediaPlaybackTargetPicker.mm:
+ (WebMediaPlaybackTargetPicker::setMockMediaPlaybackTargetPickerEnabled): New.
+ (WebMediaPlaybackTargetPicker::setMockMediaPlaybackTargetPickerState): Ditto.
+
+ * WebView/WebView.mm:
+ (-[WebView _setMockMediaPlaybackTargetPickerEnabled:]): New.
+ (-[WebView _setMockMediaPlaybackTargetPickerName:state:]): Ditto.
+ * WebView/WebViewInternal.h:
+
+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189135. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -211,10 +211,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- virtual void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- virtual void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- virtual void showPlaybackTargetPicker(uint64_t /*contextId*/, const WebCore::IntPoint&, bool /* hasVideo */) override;
- virtual void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, WebCore::MediaProducer::MediaStateFlags) override;
</del><ins>+ void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
+ void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
+ void showPlaybackTargetPicker(uint64_t /*contextId*/, const WebCore::IntPoint&, bool /* hasVideo */) override;
+ void playbackTargetPickerClientStateDidChange(uint64_t /*contextId*/, WebCore::MediaProducer::MediaStateFlags) override;
+ void setMockMediaPlaybackTargetPickerEnabled(bool) override;
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1041,4 +1041,15 @@
</span><span class="cx"> {
</span><span class="cx"> [m_webView _playbackTargetPickerClientStateDidChange:contextId state:state];
</span><span class="cx"> }
</span><ins>+
+void WebChromeClient::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ [m_webView _setMockMediaPlaybackTargetPickerEnabled:enabled];
+}
+
+void WebChromeClient::setMockMediaPlaybackTargetPickerState(const String& name, MediaPlaybackTargetContext::State state)
+{
+ [m_webView _setMockMediaPlaybackTargetPickerName:name state:state];
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #include <WebCore/MediaPlaybackTarget.h>
</span><ins>+#include <WebCore/MediaPlaybackTargetContext.h>
</ins><span class="cx"> #include <WebCore/WebMediaSessionManagerClient.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="lines">@@ -46,6 +47,8 @@
</span><span class="cx"> void removePlaybackTargetPickerClient(uint64_t);
</span><span class="cx"> void showPlaybackTargetPicker(uint64_t, const WebCore::FloatRect&, bool hasVideo);
</span><span class="cx"> void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags);
</span><ins>+ void setMockMediaPlaybackTargetPickerEnabled(bool);
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State);
</ins><span class="cx">
</span><span class="cx"> // WebMediaSessionManagerClient
</span><span class="cx"> virtual void setPlaybackTarget(uint64_t, Ref<WebCore::MediaPlaybackTarget>&&) override;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -61,6 +61,16 @@
</span><span class="cx"> WebCore::WebMediaSessionManager::shared().clientStateDidChange(*this, contextId, state);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebMediaPlaybackTargetPicker::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ WebCore::WebMediaSessionManager::shared().setMockMediaPlaybackTargetPickerEnabled(enabled);
+}
+
+void WebMediaPlaybackTargetPicker::setMockMediaPlaybackTargetPickerState(const String& name, WebCore::MediaPlaybackTargetContext::State state)
+{
+ WebCore::WebMediaSessionManager::shared().setMockMediaPlaybackTargetPickerState(name, state);
+}
+
</ins><span class="cx"> void WebMediaPlaybackTargetPicker::setPlaybackTarget(uint64_t contextId, Ref<WebCore::MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -8687,6 +8687,16 @@
</span><span class="cx"> {
</span><span class="cx"> [self _devicePicker]->playbackTargetPickerClientStateDidChange(clientId, state);
</span><span class="cx"> }
</span><ins>+
+- (void)_setMockMediaPlaybackTargetPickerEnabled:(bool)enabled
+{
+ [self _devicePicker]->setMockMediaPlaybackTargetPickerEnabled(enabled);
+}
+
+- (void)_setMockMediaPlaybackTargetPickerName:(NSString *)name state:(WebCore::MediaPlaybackTargetContext::State)state
+{
+ [self _devicePicker]->setMockMediaPlaybackTargetPickerState(name, state);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebViewInternal.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> class WebSelectionServiceController;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><ins>+#import <WebCore/MediaPlaybackTargetContext.h>
</ins><span class="cx"> #import <WebCore/MediaProducer.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -284,6 +285,8 @@
</span><span class="cx"> - (void)_removePlaybackTargetPickerClient:(uint64_t)contextId;
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(uint64_t)contextId location:(const WebCore::IntPoint&)location hasVideo:(BOOL)hasVideo;
</span><span class="cx"> - (void)_playbackTargetPickerClientStateDidChange:(uint64_t)contextId state:(WebCore::MediaProducer::MediaStateFlags)state;
</span><ins>+- (void)_setMockMediaPlaybackTargetPickerEnabled:(bool)enabled;
+- (void)_setMockMediaPlaybackTargetPickerName:(NSString *)name state:(WebCore::MediaPlaybackTargetContext::State)state;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192200. rdar://problem/24154288
+
+ 2015-11-09 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Add a mock AppleTV device for testing
+ https://bugs.webkit.org/show_bug.cgi?id=148912
+ <rdar://problem/22596272>
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::encode): Update for MediaPlaybackTargetContext changes.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::decode): Ditto.
+ * Shared/WebCoreArgumentCoders.h:
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData): Ditto.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData): Ditto.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setMockMediaPlaybackTargetPickerEnabled): New.
+ (WebKit::WebPageProxy::setMockMediaPlaybackTargetPickerState): Ditto.
+ * UIProcess/WebPageProxy.h:
+
+ * UIProcess/WebPageProxy.messages.in: Add SetMockMediaPlaybackTargetPickerEnabled and
+ SetMockMediaPlaybackTargetPickerState.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::setMockMediaPlaybackTargetPickerEnabled): New.
+ (WebKit::WebChromeClient::setMockMediaPlaybackTargetPickerState): Ditto.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
+ * WebProcess/WebPage/WebPage.h: MediaPlaybackTargetContext is a class, not a struct.
+
+ * WebProcess/WebPage/WebPage.messages.in: Ditto.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::playbackTargetSelected): Support mock target.
+
+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189135. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -2189,26 +2189,47 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void ArgumentCoder<MediaPlaybackTargetContext>::encode(ArgumentEncoder& encoder, const MediaPlaybackTargetContext& target)
</span><span class="cx"> {
</span><del>- int32_t targetType = target.type;
</del><ins>+ bool hasPlatformData = target.encodingRequiresPlatformData();
+ encoder << hasPlatformData;
+
+ int32_t targetType = target.type();
</ins><span class="cx"> encoder << targetType;
</span><span class="cx">
</span><del>- if (!target.encodingRequiresPlatformData())
</del><ins>+ if (target.encodingRequiresPlatformData()) {
+ encodePlatformData(encoder, target);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- encodePlatformData(encoder, target);
</del><ins>+ ASSERT(targetType == MediaPlaybackTargetContext::MockType);
+ encoder << target.mockDeviceName();
+ encoder << static_cast<int32_t>(target.mockState());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<MediaPlaybackTargetContext>::decode(ArgumentDecoder& decoder, MediaPlaybackTargetContext& target)
</span><span class="cx"> {
</span><ins>+ bool hasPlatformData;
+ if (!decoder.decode(hasPlatformData))
+ return false;
+
</ins><span class="cx"> int32_t targetType;
</span><span class="cx"> if (!decoder.decode(targetType))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- target.type = static_cast<MediaPlaybackTargetContext::ContextType>(targetType);
- if (!target.encodingRequiresPlatformData())
</del><ins>+ if (hasPlatformData)
+ return decodePlatformData(decoder, target);
+
+ ASSERT(targetType == MediaPlaybackTargetContext::MockType);
+
+ String mockDeviceName;
+ if (!decoder.decode(mockDeviceName))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return decodePlatformData(decoder, target);
</del><ins>+ int32_t mockState;
+ if (!decoder.decode(mockState))
+ return false;
+
+ target = MediaPlaybackTargetContext(mockDeviceName, static_cast<MediaPlaybackTargetContext::State>(mockState));
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> namespace WebCore {
</span><del>-struct MediaPlaybackTargetContext;
</del><ins>+class MediaPlaybackTargetContext;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -491,14 +491,12 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData(ArgumentEncoder& encoder, const MediaPlaybackTargetContext& target)
</span><span class="cx"> {
</span><del>- ASSERT(target.type == MediaPlaybackTargetContext::AVOutputContextType);
-
</del><span class="cx"> RetainPtr<NSMutableData> data = adoptNS([[NSMutableData alloc] init]);
</span><span class="cx"> RetainPtr<NSKeyedArchiver> archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
</span><span class="cx"> [archiver setRequiresSecureCoding:YES];
</span><span class="cx">
</span><span class="cx"> if ([getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
</span><del>- [archiver encodeObject:target.context.avOutputContext forKey:deviceContextKey()];
</del><ins>+ [archiver encodeObject:target.avOutputContext() forKey:deviceContextKey()];
</ins><span class="cx">
</span><span class="cx"> [archiver finishEncoding];
</span><span class="cx"> IPC::encode(encoder, reinterpret_cast<CFDataRef>(data.get()));
</span><span class="lines">@@ -507,8 +505,6 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData(ArgumentDecoder& decoder, MediaPlaybackTargetContext& target)
</span><span class="cx"> {
</span><del>- ASSERT(target.type == MediaPlaybackTargetContext::AVOutputContextType);
-
</del><span class="cx"> if (![getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -523,11 +519,11 @@
</span><span class="cx"> @try {
</span><span class="cx"> context = [unarchiver decodeObjectOfClass:getAVOutputContextClass() forKey:deviceContextKey()];
</span><span class="cx"> } @catch (NSException *exception) {
</span><del>- LOG_ERROR("The target picker being decoded is not a AVOutputContext.");
</del><ins>+ LOG_ERROR("The target picker being decoded is not an AVOutputContext.");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- target.context.avOutputContext = context;
</del><ins>+ target = MediaPlaybackTargetContext(context);
</ins><span class="cx">
</span><span class="cx"> [unarchiver finishDecoding];
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -6074,6 +6074,16 @@
</span><span class="cx"> m_pageClient.mediaSessionManager().clientStateDidChange(*this, contextId, state);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ m_pageClient.mediaSessionManager().setMockMediaPlaybackTargetPickerEnabled(enabled);
+}
+
+void WebPageProxy::setMockMediaPlaybackTargetPickerState(const String& name, WebCore::MediaPlaybackTargetContext::State state)
+{
+ m_pageClient.mediaSessionManager().setMockMediaPlaybackTargetPickerState(name, state);
+}
+
</ins><span class="cx"> void WebPageProxy::setPlaybackTarget(uint64_t contextId, Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1058,6 +1058,8 @@
</span><span class="cx"> void removePlaybackTargetPickerClient(uint64_t);
</span><span class="cx"> void showPlaybackTargetPicker(uint64_t, const WebCore::FloatRect&, bool hasVideo);
</span><span class="cx"> void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags);
</span><ins>+ void setMockMediaPlaybackTargetPickerEnabled(bool);
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State);
</ins><span class="cx">
</span><span class="cx"> // WebMediaSessionManagerClient
</span><span class="cx"> virtual void setPlaybackTarget(uint64_t, Ref<WebCore::MediaPlaybackTarget>&&) override;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -442,6 +442,8 @@
</span><span class="cx"> RemovePlaybackTargetPickerClient(uint64_t contextId)
</span><span class="cx"> ShowPlaybackTargetPicker(uint64_t clientId, WebCore::FloatRect pickerLocation, bool hasVideo)
</span><span class="cx"> PlaybackTargetPickerClientStateDidChange(uint64_t contextId, unsigned mediaState)
</span><ins>+ SetMockMediaPlaybackTargetPickerEnabled(bool enabled)
+ SetMockMediaPlaybackTargetPickerState(String name, unsigned pickerState)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -1156,6 +1156,16 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebPageProxy::PlaybackTargetPickerClientStateDidChange(contextId, state));
</span><span class="cx"> }
</span><ins>+
+void WebChromeClient::setMockMediaPlaybackTargetPickerEnabled(bool enabled)
+{
+ m_page->send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerEnabled(enabled));
+}
+
+void WebChromeClient::setMockMediaPlaybackTargetPickerState(const String& name, WebCore::MediaPlaybackTargetContext::State state)
+{
+ m_page->send(Messages::WebPageProxy::SetMockMediaPlaybackTargetPickerState(name, state));
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -317,10 +317,12 @@
</span><span class="cx"> virtual void handleAutoFillButtonClick(WebCore::HTMLInputElement&) override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- virtual void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- virtual void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
- virtual void showPlaybackTargetPicker(uint64_t contextId, const WebCore::IntPoint&, bool) override;
- virtual void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags) override;
</del><ins>+ void addPlaybackTargetPickerClient(uint64_t /*contextId*/) override;
+ void removePlaybackTargetPickerClient(uint64_t /*contextId*/) override;
+ void showPlaybackTargetPicker(uint64_t contextId, const WebCore::IntPoint&, bool) override;
+ void playbackTargetPickerClientStateDidChange(uint64_t, WebCore::MediaProducer::MediaStateFlags) override;
+ void setMockMediaPlaybackTargetPickerEnabled(bool) override;
+ void setMockMediaPlaybackTargetPickerState(const String&, WebCore::MediaPlaybackTargetContext::State) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> class HTMLPlugInImageElement;
</span><span class="cx"> class IntPoint;
</span><span class="cx"> class KeyboardEvent;
</span><ins>+class MediaPlaybackTargetContext;
</ins><span class="cx"> class Page;
</span><span class="cx"> class PrintContext;
</span><span class="cx"> class Range;
</span><span class="lines">@@ -141,7 +142,6 @@
</span><span class="cx"> class VisibleSelection;
</span><span class="cx"> struct Highlight;
</span><span class="cx"> struct KeypressCommand;
</span><del>-struct MediaPlaybackTargetContext;
</del><span class="cx"> struct TextCheckingResult;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> SetShouldDispatchFakeMouseMoveEvents(bool shouldDispatchFakeMouseMoveEvents)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- PlaybackTargetSelected(uint64_t contextId, struct WebCore::MediaPlaybackTargetContext target)
</del><ins>+ PlaybackTargetSelected(uint64_t contextId, WebCore::MediaPlaybackTargetContext target)
</ins><span class="cx"> PlaybackTargetAvailabilityDidChange(uint64_t contextId, bool available)
</span><span class="cx"> SetShouldPlayToPlaybackTarget(uint64_t contextId, bool shouldPlay)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (195066 => 195067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-01-14 19:18:59 UTC (rev 195066)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-01-14 19:19:28 UTC (rev 195067)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> #include <WebCore/MediaPlaybackTargetMac.h>
</span><ins>+#include <WebCore/MediaPlaybackTargetMock.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -1265,9 +1266,17 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx"> void WebPage::playbackTargetSelected(uint64_t contextId, const WebCore::MediaPlaybackTargetContext& targetContext) const
</span><span class="cx"> {
</span><del>- ASSERT(targetContext.type == MediaPlaybackTargetContext::AVOutputContextType);
-
- m_page->setPlaybackTarget(contextId, WebCore::MediaPlaybackTargetMac::create(targetContext.context.avOutputContext));
</del><ins>+ switch (targetContext.type()) {
+ case MediaPlaybackTargetContext::AVOutputContextType:
+ m_page->setPlaybackTarget(contextId, WebCore::MediaPlaybackTargetMac::create(targetContext.avOutputContext()));
+ break;
+ case MediaPlaybackTargetContext::MockType:
+ m_page->setPlaybackTarget(contextId, WebCore::MediaPlaybackTargetMock::create(targetContext.mockDeviceName(), targetContext.mockState()));
+ break;
+ case MediaPlaybackTargetContext::None:
+ ASSERT_NOT_REACHED();
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::playbackTargetAvailabilityDidChange(uint64_t contextId, bool changed)
</span></span></pre>
</div>
</div>
</body>
</html>