<!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>[182630] trunk/Source</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/182630">182630</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-10 07:31:48 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>
[Mac] Refactor MediaPlaybackTarget
https://bugs.webkit.org/show_bug.cgi?id=143571
Reviewed by Jer Noble.
Source/WebCore/:
* WebCore.xcodeproj/project.pbxproj:
* dom/Document.cpp:
(WebCore::Document::addPlaybackTargetPickerClient): Don't call client if page playback target
is NULL.
(WebCore::Document::didChoosePlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
* dom/Document.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setWirelessPlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
* html/HTMLMediaElement.h:
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::HTMLMediaSession): Don't initialize m_playbackTarget.
(WebCore::HTMLMediaSession::didChoosePlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
* html/HTMLMediaSession.h:
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::playbackTarget): m_playbackTarget is a RefPtr<MediaPlaybackTarget>
(WebCore::Page::didChoosePlaybackTarget): Ditto.
* page/Page.h:
* platform/audio/MediaSession.h:
(WebCore::MediaSessionClient::setWirelessPlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.
Make MediaPlaybackTarget RefCounted, and don't require it to be serializable so it can be
subclassed to keep port-specific iformation out of the base class.
* platform/graphics/MediaPlaybackTarget.h:
(WebCore::MediaPlaybackTarget::targetType):
(WebCore::MediaPlaybackTarget::targetContext):
(WebCore::MediaPlaybackTarget::hasActiveRoute):
(WebCore::MediaPlaybackTarget::MediaPlaybackTarget):
(WebCore::MediaPlaybackTarget::setDevicePickerContext): Deleted.
(WebCore::MediaPlaybackTarget::devicePickerContext): Deleted.
MediaPlaybackTargetContext is the struct that is serialized to pass across the process boudary.
It has union to hold port-specific data.
* platform/graphics/MediaPlaybackTargetContext.h: Added.
* platform/graphics/MediaPlaybackTargetPicker.h: didChoosePlaybackTarget takes a Ref<MediaPlaybackTarget>&&
* platform/graphics/MediaPlaybackTargetPickerClient.h: Ditto.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::setWirelessPlaybackTarget): Ditto.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::setWirelessPlaybackTarget):
* platform/graphics/avfoundation/MediaPlaybackTargetMac.h: Added.
(WebCore::MediaPlaybackTargetMac::targetType):
(WebCore::MediaPlaybackTargetMac::outputContext):
* platform/graphics/avfoundation/MediaPlaybackTargetMac.mm:
(WebCore::MediaPlaybackTargetMac::create):
(WebCore::MediaPlaybackTargetMac::MediaPlaybackTargetMac):
(WebCore::MediaPlaybackTargetMac::~MediaPlaybackTargetMac):
(WebCore::MediaPlaybackTargetMac::targetContext):
(WebCore::MediaPlaybackTargetMac::hasActiveRoute):
(WebCore::toMediaPlaybackTargetMac):
(WebCore::MediaPlaybackTarget::encode): Deleted.
(WebCore::MediaPlaybackTarget::decode): Deleted.
(WebCore::MediaPlaybackTarget::hasActiveRoute): Deleted.
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Allocate and pass a MediaPlaybackTargetMac
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget): Take a Ref<MediaPlaybackTarget&&
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setWirelessPlaybackTarget): Ditto.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::setWirelessPlaybackTarget): Ditto.
Source/WebKit2:
Pass a MediaPlaybackTargetContext across process boundary instead of a MediaPlaybackTarget.
* Shared/WebCoreArgumentCoders.h:
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::encode): New.
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::decode): New.
* Shared/mac/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData): New.
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData): New.
(IPC::ArgumentCoder<MediaPlaybackTarget>::encode): Deleted.
(IPC::ArgumentCoder<MediaPlaybackTarget>::decode): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChoosePlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::playbackTargetSelected): Take a Ref<MediaPlaybackTarget>&&.
Source/WebKit/mac/:
* WebView/WebMediaPlaybackTargetPicker.h:
* WebView/WebMediaPlaybackTargetPicker.mm:
(WebMediaPlaybackTargetPicker::didChoosePlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessionh">trunk/Source/WebCore/html/HTMLMediaSession.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargeth">trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerClienth">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPickerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebMediaPlaybackTargetPickerh">trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm">trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMach">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/ChangeLog 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1,3 +1,87 @@
</span><ins>+2015-04-10 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Refactor MediaPlaybackTarget
+ https://bugs.webkit.org/show_bug.cgi?id=143571
+
+ Reviewed by Jer Noble.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Document.cpp:
+ (WebCore::Document::addPlaybackTargetPickerClient): Don't call client if page playback target
+ is NULL.
+ (WebCore::Document::didChoosePlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
+ * dom/Document.h:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setWirelessPlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
+ * html/HTMLMediaElement.h:
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::HTMLMediaSession): Don't initialize m_playbackTarget.
+ (WebCore::HTMLMediaSession::didChoosePlaybackTarget): MediaPlaybackTarget is passed as a Ref<>
+ * html/HTMLMediaSession.h:
+
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::playbackTarget): m_playbackTarget is a RefPtr<MediaPlaybackTarget>
+ (WebCore::Page::didChoosePlaybackTarget): Ditto.
+ * page/Page.h:
+
+ * platform/audio/MediaSession.h:
+ (WebCore::MediaSessionClient::setWirelessPlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.
+
+ Make MediaPlaybackTarget RefCounted, and don't require it to be serializable so it can be
+ subclassed to keep port-specific iformation out of the base class.
+ * platform/graphics/MediaPlaybackTarget.h:
+ (WebCore::MediaPlaybackTarget::targetType):
+ (WebCore::MediaPlaybackTarget::targetContext):
+ (WebCore::MediaPlaybackTarget::hasActiveRoute):
+ (WebCore::MediaPlaybackTarget::MediaPlaybackTarget):
+ (WebCore::MediaPlaybackTarget::setDevicePickerContext): Deleted.
+ (WebCore::MediaPlaybackTarget::devicePickerContext): Deleted.
+
+ MediaPlaybackTargetContext is the struct that is serialized to pass across the process boudary.
+ It has union to hold port-specific data.
+ * platform/graphics/MediaPlaybackTargetContext.h: Added.
+
+ * platform/graphics/MediaPlaybackTargetPicker.h: didChoosePlaybackTarget takes a Ref<MediaPlaybackTarget>&&
+ * platform/graphics/MediaPlaybackTargetPickerClient.h: Ditto.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::setWirelessPlaybackTarget): Ditto.
+ * platform/graphics/MediaPlayer.h:
+
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::setWirelessPlaybackTarget):
+
+ * platform/graphics/avfoundation/MediaPlaybackTargetMac.h: Added.
+ (WebCore::MediaPlaybackTargetMac::targetType):
+ (WebCore::MediaPlaybackTargetMac::outputContext):
+ * platform/graphics/avfoundation/MediaPlaybackTargetMac.mm:
+ (WebCore::MediaPlaybackTargetMac::create):
+ (WebCore::MediaPlaybackTargetMac::MediaPlaybackTargetMac):
+ (WebCore::MediaPlaybackTargetMac::~MediaPlaybackTargetMac):
+ (WebCore::MediaPlaybackTargetMac::targetContext):
+ (WebCore::MediaPlaybackTargetMac::hasActiveRoute):
+ (WebCore::toMediaPlaybackTargetMac):
+ (WebCore::MediaPlaybackTarget::encode): Deleted.
+ (WebCore::MediaPlaybackTarget::decode): Deleted.
+ (WebCore::MediaPlaybackTarget::hasActiveRoute): Deleted.
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Allocate and pass a MediaPlaybackTargetMac
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget): Take a Ref<MediaPlaybackTarget&&
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setWirelessPlaybackTarget): Ditto.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::setWirelessPlaybackTarget): Ditto.
+
</ins><span class="cx"> 2015-04-09 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Fix raw function pointer usages
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -121,6 +121,8 @@
</span><span class="cx"> 0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */; };
</span><span class="cx"> 071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */; };
</span><span class="cx"> 071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm */; };
+ 071E49701AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 071E496F1AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0720B0A014D3323500642955 /* GenericEventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0720B09E14D3323500642955 /* GenericEventQueue.cpp */; };
</span><span class="cx"> 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 /* GenericEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07277E4C17D018CC0015534D /* JSMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07277E4017D018CC0015534D /* JSMediaStream.cpp */; };
</span><span class="lines">@@ -175,7 +177,6 @@
</span><span class="cx"> 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */ = {isa = PBXBuildFile; fileRef = 074E82B918A69F0E007EF54C /* PlatformTimeRanges.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0753860014489E9800B78452 /* CachedTextTrack.cpp */; };
</span><span class="cx"> 0753860314489E9800B78452 /* CachedTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0753860114489E9800B78452 /* CachedTextTrack.h */; };
</span><del>- 0760C17A1AA8FC7D009ED7B8 /* MediaPlaybackTargetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07E3DFD21A9E78A500764CA8 /* MediaPlaybackTargetMac.mm */; };
</del><span class="cx"> 076306D017E1478D005A7C4E /* MediaStreamTrackSourcesCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 076306CC17E1478D005A7C4E /* MediaStreamTrackSourcesCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 076306D217E1478D005A7C4E /* MediaStreamTrackSourcesRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 076306CE17E1478D005A7C4E /* MediaStreamTrackSourcesRequest.cpp */; };
</span><span class="cx"> 076306D317E1478D005A7C4E /* MediaStreamTrackSourcesRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 076306CF17E1478D005A7C4E /* MediaStreamTrackSourcesRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -341,7 +342,8 @@
</span><span class="cx"> 07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
</span><span class="cx"> 07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */; };
</span><span class="cx"> 07F0B97A1AC5DB3300E535D9 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */; };
</span><del>- 07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; };
</del><ins>+ 07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 07F944161864D046005D31CB /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* MediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
</span><span class="cx"> 07FE99DC18807A7D00256648 /* HTMLMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */; };
</span><span class="lines">@@ -7112,6 +7114,8 @@
</span><span class="cx"> 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamPrivate.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueGeneric.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueGeneric.h; sourceTree = "<group>"; };
</span><ins>+ 071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlaybackTargetMac.mm; sourceTree = "<group>"; };
+ 071E496F1AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetMac.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0720B09E14D3323500642955 /* GenericEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericEventQueue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0720B09F14D3323500642955 /* GenericEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericEventQueue.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221B4A17CEC32700848E51 /* MediaConstraintsImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaConstraintsImpl.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -7365,12 +7369,12 @@
</span><span class="cx"> 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCueCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07E3DFD01A9E786500764CA8 /* MediaPlaybackTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTarget.h; sourceTree = "<group>"; };
</span><del>- 07E3DFD21A9E78A500764CA8 /* MediaPlaybackTargetMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MediaPlaybackTargetMac.mm; path = platform/graphics/avfoundation/MediaPlaybackTargetMac.mm; sourceTree = SOURCE_ROOT; };
</del><span class="cx"> 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandMetadataTextTrackPrivateAVF.h; sourceTree = "<group>"; };
</span><span class="cx"> 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandMetadataTextTrackPrivateAVF.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSessionManagerMac.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVKitSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVFoundationSPI.h; sourceTree = "<group>"; };
</span><ins>+ 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetContext.h; sourceTree = "<group>"; };
</ins><span class="cx"> 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataCueCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaSession.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07FE99DB18807A7D00256648 /* HTMLMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaSession.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14724,6 +14728,8 @@
</span><span class="cx"> 076F0D0812B8192700C26AA4 /* avfoundation */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 071E496F1AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h */,
+ 071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm */,
</ins><span class="cx"> DF9AFD6F13FC31B00015FEB7 /* objc */,
</span><span class="cx"> CDE3A85217F5FCE600C5BE20 /* AudioTrackPrivateAVF.h */,
</span><span class="cx"> 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */,
</span><span class="lines">@@ -14732,7 +14738,6 @@
</span><span class="cx"> 07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */,
</span><span class="cx"> 078E43DB1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.h */,
</span><span class="cx"> 078E43DC1ABB6F6F001C2FA6 /* MediaPlaybackTargetPickerMac.mm */,
</span><del>- 07E3DFD21A9E78A500764CA8 /* MediaPlaybackTargetMac.mm */,
</del><span class="cx"> 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */,
</span><span class="cx"> 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */,
</span><span class="cx"> CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */,
</span><span class="lines">@@ -20788,6 +20793,7 @@
</span><span class="cx"> 141DC04E164834B900371E5A /* LayoutSize.h */,
</span><span class="cx"> 6C568CAE19DAFEA000430CA2 /* MaskImageOperation.cpp */,
</span><span class="cx"> 6C568CAF19DAFEA000430CA2 /* MaskImageOperation.h */,
</span><ins>+ 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */,
</ins><span class="cx"> 078E43D71ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.cpp */,
</span><span class="cx"> 078E43D81ABB6C7E001C2FA6 /* MediaPlaybackTargetPicker.h */,
</span><span class="cx"> 079216531AA560AA00A3C049 /* MediaPlaybackTargetPickerClient.h */,
</span><span class="lines">@@ -25440,6 +25446,7 @@
</span><span class="cx"> B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */,
</span><span class="cx"> 7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */,
</span><span class="cx"> 8485227C1190162C006EDC7F /* JSSVGHKernElement.h in Headers */,
</span><ins>+ 07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */,
</ins><span class="cx"> B2FA3D9F0AB75A6F000E5AC4 /* JSSVGImageElement.h in Headers */,
</span><span class="cx"> B2FA3DA10AB75A6F000E5AC4 /* JSSVGLength.h in Headers */,
</span><span class="cx"> B2FA3DA30AB75A6F000E5AC4 /* JSSVGLengthList.h in Headers */,
</span><span class="lines">@@ -25689,6 +25696,7 @@
</span><span class="cx"> CDC8B5A3180463470016E685 /* MediaPlayerPrivateMediaSourceAVFObjC.h in Headers */,
</span><span class="cx"> E44613E60CD681A900FADA75 /* MediaPlayerPrivateQTKit.h in Headers */,
</span><span class="cx"> 4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
</span><ins>+ 071E49701AD5AB5E008A50B4 /* MediaPlaybackTargetMac.h in Headers */,
</ins><span class="cx"> 4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */,
</span><span class="cx"> 4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */,
</span><span class="cx"> D3A94A39122DABAC00A37BBC /* MediaQueryList.h in Headers */,
</span><span class="lines">@@ -28042,7 +28050,6 @@
</span><span class="cx"> 9BAB6C6D12550631001626D4 /* EditingStyle.cpp in Sources */,
</span><span class="cx"> 4B3043CC0AE0373B00A82647 /* Editor.cpp in Sources */,
</span><span class="cx"> 93A38B4B0D0E5808006872C2 /* EditorCommand.cpp in Sources */,
</span><del>- 0760C17A1AA8FC7D009ED7B8 /* MediaPlaybackTargetMac.mm in Sources */,
</del><span class="cx"> FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */,
</span><span class="cx"> ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */,
</span><span class="cx"> A8C4A80809D563270003AC8D /* Element.cpp in Sources */,
</span><span class="lines">@@ -30355,6 +30362,7 @@
</span><span class="cx"> A7D6B34A0F61104500B79FD1 /* WorkerScriptLoader.cpp in Sources */,
</span><span class="cx"> 2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */,
</span><span class="cx"> 0B9056F80F2685F30095FF6A /* WorkerThreadableLoader.cpp in Sources */,
</span><ins>+ 071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */,
</ins><span class="cx"> 97AABD2C14FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp in Sources */,
</span><span class="cx"> 93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */,
</span><span class="cx"> 51B45D201AB8D1E200117CD2 /* ContentExtension.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -6539,7 +6539,9 @@
</span><span class="cx">
</span><span class="cx"> m_playbackTargetClients.add(&client);
</span><span class="cx">
</span><del>- client.didChoosePlaybackTarget(page->playbackTarget());
</del><ins>+ RefPtr<MediaPlaybackTarget> target = page->playbackTarget();
+ if (target)
+ client.didChoosePlaybackTarget(*target);
</ins><span class="cx"> client.externalOutputDeviceAvailableDidChange(page->hasWirelessPlaybackTarget());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6580,10 +6582,10 @@
</span><span class="cx"> client->externalOutputDeviceAvailableDidChange(available);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didChoosePlaybackTarget(const MediaPlaybackTarget& device)
</del><ins>+void Document::didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</ins><span class="cx"> {
</span><span class="cx"> for (auto* client : m_playbackTargetClients)
</span><del>- client->didChoosePlaybackTarget(device);
</del><ins>+ client->didChoosePlaybackTarget(device.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/dom/Document.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1235,7 +1235,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void showPlaybackTargetPicker(const HTMLMediaElement&);
</span><del>- void didChoosePlaybackTarget(const MediaPlaybackTarget&);
</del><ins>+ void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&);
</ins><span class="cx"> void addPlaybackTargetPickerClient(MediaPlaybackTargetPickerClient&);
</span><span class="cx"> void removePlaybackTargetPickerClient(MediaPlaybackTargetPickerClient&);
</span><span class="cx"> bool requiresPlaybackTargetRouteMonitoring();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -4886,11 +4886,11 @@
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(event.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::setWirelessPlaybackTarget(const MediaPlaybackTarget& device)
</del><ins>+void HTMLMediaElement::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::setWirelessPlaybackTarget(%p)", this);
</span><span class="cx"> if (m_player)
</span><del>- m_player->setWirelessPlaybackTarget(device);
</del><ins>+ m_player->setWirelessPlaybackTarget(WTF::move(device));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::canPlayToWirelessPlaybackTarget() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> virtual void wirelessRoutesAvailableDidChange() override;
</span><span class="cx"> virtual bool canPlayToWirelessPlaybackTarget() const override;
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() const override;
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&) override;
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void startPlayingToPlaybackTarget() override;
</span><span class="cx"> virtual void stopPlayingToPlaybackTarget() override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx"> , m_restrictions(NoRestrictions)
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> , m_targetAvailabilityChangedTimer(*this, &HTMLMediaSession::targetAvailabilityChangedTimerFired)
</span><del>- , m_playbackTarget(std::make_unique<MediaPlaybackTarget>())
</del><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -286,11 +285,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaSession::didChoosePlaybackTarget(const MediaPlaybackTarget& device)
</del><ins>+void HTMLMediaSession::didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</ins><span class="cx"> {
</span><del>- m_playbackTarget->setDevicePickerContext(device.devicePickerContext());
- client().setWirelessPlaybackTarget(*m_playbackTarget.get());
- if (device.hasActiveRoute() && MediaSessionManager::sharedManager().currentSession() == this)
</del><ins>+ m_playbackTarget = WTF::move(device);
+ client().setWirelessPlaybackTarget(*m_playbackTarget.copyRef());
+ if (m_playbackTarget->hasActiveRoute() && MediaSessionManager::sharedManager().currentSession() == this)
</ins><span class="cx"> startPlayingToPlaybackTarget();
</span><span class="cx"> else
</span><span class="cx"> stopPlayingToPlaybackTarget();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/html/HTMLMediaSession.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> void targetAvailabilityChangedTimerFired();
</span><span class="cx">
</span><span class="cx"> // MediaPlaybackTargetPickerClient
</span><del>- virtual void didChoosePlaybackTarget(const MediaPlaybackTarget&) override;
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) const override;
</span><span class="cx"> virtual bool requiresPlaybackTargetRouteMonitoring() const override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> mutable Timer m_targetAvailabilityChangedTimer;
</span><del>- std::unique_ptr<MediaPlaybackTarget> m_playbackTarget;
</del><ins>+ RefPtr<MediaPlaybackTarget> m_playbackTarget;
</ins><span class="cx"> bool m_hasPlaybackTargetAvailabilityListeners { false };
</span><span class="cx"> mutable bool m_hasPlaybackTargets { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/page/Page.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -214,9 +214,6 @@
</span><span class="cx"> , m_userContentController(WTF::move(pageConfiguration.userContentController))
</span><span class="cx"> , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
</span><span class="cx"> , m_sessionID(SessionID::defaultSessionID())
</span><del>-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- , m_playbackTarget(std::make_unique<MediaPlaybackTarget>())
-#endif
</del><span class="cx"> , m_isClosing(false)
</span><span class="cx"> , m_isPlayingAudio(false)
</span><span class="cx"> {
</span><span class="lines">@@ -1686,6 +1683,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><ins>+RefPtr<MediaPlaybackTarget> Page::playbackTarget() const
+{
+ if (!m_playbackTarget)
+ return nullptr;
+
+ return m_playbackTarget.copyRef();
+}
+
</ins><span class="cx"> void Page::showPlaybackTargetPicker(const WebCore::IntPoint& location, bool isVideo)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -1697,11 +1702,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::didChoosePlaybackTarget(const MediaPlaybackTarget& target)
</del><ins>+void Page::didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><del>- m_playbackTarget->setDevicePickerContext(target.devicePickerContext());
</del><ins>+ m_playbackTarget = WTF::move(target);
</ins><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
</span><del>- frame->document()->didChoosePlaybackTarget(target);
</del><ins>+ frame->document()->didChoosePlaybackTarget(*m_playbackTarget.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::playbackTargetAvailabilityDidChange(bool available)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/page/Page.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -430,10 +430,10 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void showPlaybackTargetPicker(const WebCore::IntPoint&, bool);
</span><span class="cx"> bool hasWirelessPlaybackTarget() const { return m_hasWirelessPlaybackTarget; }
</span><del>- MediaPlaybackTarget& playbackTarget() const { return *m_playbackTarget.get(); }
</del><ins>+ RefPtr<MediaPlaybackTarget> playbackTarget() const;
</ins><span class="cx"> void configurePlaybackTargetMonitoring();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void didChoosePlaybackTarget(const MediaPlaybackTarget&);
</del><ins>+ WEBCORE_EXPORT void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&);
</ins><span class="cx"> WEBCORE_EXPORT void playbackTargetAvailabilityDidChange(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- std::unique_ptr<MediaPlaybackTarget> m_playbackTarget;
</del><ins>+ RefPtr<MediaPlaybackTarget> m_playbackTarget;
</ins><span class="cx"> bool m_hasWirelessPlaybackTarget { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> // MediaPlaybackTargetPickerClient
</span><del>- virtual void didChoosePlaybackTarget(const MediaPlaybackTarget&) override { }
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&) override { }
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) const override { }
</span><span class="cx"> virtual bool requiresPlaybackTargetRouteMonitoring() const override { return false; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> virtual bool overrideBackgroundPlaybackRestriction() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual void wirelessRoutesAvailableDidChange() { }
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&) { }
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) { }
</ins><span class="cx"> virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual void startPlayingToPlaybackTarget() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTarget.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -28,45 +28,26 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span><del>-#include <wtf/RetainPtr.h>
</del><ins>+#include "MediaPlaybackTargetContext.h"
+#include <wtf/RefCounted.h>
</ins><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-OBJC_CLASS NSKeyedArchiver;
-OBJC_CLASS NSKeyedUnarchiver;
-OBJC_CLASS AVOutputContext;
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaPlaybackTarget {
</del><ins>+class MediaPlaybackTarget : public RefCounted<MediaPlaybackTarget> {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~MediaPlaybackTarget() { }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- WEBCORE_EXPORT MediaPlaybackTarget(AVOutputContext *context = nil) { m_devicePickerContext = context; }
</del><ins>+ enum TargetType {
+ None,
+ AVFoundation,
+ };
+ virtual TargetType targetType() const { return None; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void encode(NSKeyedArchiver *) const;
- WEBCORE_EXPORT static bool decode(NSKeyedUnarchiver *, MediaPlaybackTarget&);
</del><ins>+ virtual const MediaPlaybackTargetContext& targetContext() const { return NoMediaPlaybackTargetContext; }
+ virtual bool hasActiveRoute() const { return false; }
</ins><span class="cx">
</span><del>- void setDevicePickerContext(AVOutputContext *context) { m_devicePickerContext = context; }
- AVOutputContext *devicePickerContext() const { return m_devicePickerContext.get(); }
-
-#if PLATFORM(IOS)
- bool hasActiveRoute() const { return false; }
-#else
- bool hasActiveRoute() const;
-#endif
-
-#else
- void setDevicePickerContext(AVOutputContext *) { }
- AVOutputContext *devicePickerContext() const { return nullptr; }
- bool hasActiveRoute() const { return false; }
-#endif
-
</del><span class="cx"> protected:
</span><del>-#if PLATFORM(COCOA)
- RetainPtr<AVOutputContext> m_devicePickerContext;
-#endif
</del><ins>+ MediaPlaybackTarget() { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h (0 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -0,0 +1,60 @@
</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 MediaPlaybackTargetContext_h
+#define MediaPlaybackTargetContext_h
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+
+OBJC_CLASS AVOutputContext;
+
+#if PLATFORM(COCOA)
+OBJC_CLASS NSKeyedArchiver;
+OBJC_CLASS NSKeyedUnarchiver;
+#endif
+
+namespace WebCore {
+
+struct MediaPlaybackTargetContext {
+
+ enum ContextType : int32_t {
+ None,
+ AVOutputContextType,
+ } type;
+
+ union {
+ AVOutputContext* avOutputContext;
+ } context;
+
+ bool encodingRequiresPlatformData() const { return type == AVOutputContextType; }
+};
+
+const MediaPlaybackTargetContext NoMediaPlaybackTargetContext = { MediaPlaybackTargetContext::None, {nullptr} };
+
+}
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
+
+#endif // MediaPlaybackTargetContext
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-04-10 14:31:48 UTC (rev 182630)
</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/Ref.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatRect;
</span><span class="lines">@@ -40,7 +42,7 @@
</span><span class="cx"> virtual ~Client() { }
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- virtual void didChoosePlaybackTarget(const MediaPlaybackTarget&) = 0;
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&) = 0;
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) = 0;
</span><span class="cx">
</span><span class="cx"> void invalidate();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPickerClient.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPickerClient.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPickerClient.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaPlaybackTargetPickerClient() { }
</span><span class="cx">
</span><del>- virtual void didChoosePlaybackTarget(const MediaPlaybackTarget&) = 0;
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&&) = 0;
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) const = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool requiresPlaybackTargetRouteMonitoring() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -883,9 +883,9 @@
</span><span class="cx"> return m_private->isPlayingToWirelessPlaybackTarget();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::setWirelessPlaybackTarget(const MediaPlaybackTarget& device)
</del><ins>+void MediaPlayer::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</ins><span class="cx"> {
</span><del>- m_private->setWirelessPlaybackTarget(device);
</del><ins>+ m_private->setWirelessPlaybackTarget(WTF::move(device));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::startPlayingToPlaybackTarget()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx">
</span><span class="cx"> bool canPlayToWirelessPlaybackTarget() const;
</span><span class="cx"> bool isPlayingToWirelessPlaybackTarget() const;
</span><del>- void setWirelessPlaybackTarget(const MediaPlaybackTarget&);
</del><ins>+ void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</ins><span class="cx">
</span><span class="cx"> void startPlayingToPlaybackTarget();
</span><span class="cx"> void stopPlayingToPlaybackTarget();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() { return false; }
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&) { }
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void startPlayingToPlaybackTarget() { }
</span><span class="cx"> virtual void stopPlayingToPlaybackTarget() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMach"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h (0 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -0,0 +1,63 @@
</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 MediaPlaybackTargetMac_h
+#define MediaPlaybackTargetMac_h
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+
+#include "MediaPlaybackTarget.h"
+#include <wtf/RetainPtr.h>
+
+namespace WebCore {
+
+class MediaPlaybackTargetMac : public MediaPlaybackTarget {
+public:
+ WEBCORE_EXPORT static Ref<MediaPlaybackTarget> create(AVOutputContext *);
+
+ virtual ~MediaPlaybackTargetMac();
+
+ virtual TargetType targetType() const { return AVFoundation; }
+
+ virtual const MediaPlaybackTargetContext& targetContext() const;
+ virtual bool hasActiveRoute() const;
+
+ AVOutputContext *outputContext() const { return m_outputContext.get(); }
+
+protected:
+ MediaPlaybackTargetMac(AVOutputContext *);
+
+ RetainPtr<AVOutputContext> m_outputContext;
+ mutable MediaPlaybackTargetContext m_context;
+};
+
+MediaPlaybackTargetMac* toMediaPlaybackTargetMac(MediaPlaybackTarget*);
+const MediaPlaybackTargetMac* toMediaPlaybackTargetMac(const MediaPlaybackTarget*);
+
+}
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlaybackTargetMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetMac.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "MediaPlaybackTarget.h"
</del><ins>+#import "MediaPlaybackTargetMac.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><span class="lines">@@ -37,37 +37,45 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static NSString * const deviceContextKey = @"deviceContext";
</del><ins>+Ref<MediaPlaybackTarget> MediaPlaybackTargetMac::create(AVOutputContext *context)
+{
+ return adoptRef(*new MediaPlaybackTargetMac(context));
+}
</ins><span class="cx">
</span><del>-void MediaPlaybackTarget::encode(NSKeyedArchiver *archiver) const
</del><ins>+MediaPlaybackTargetMac::MediaPlaybackTargetMac(AVOutputContext *context)
+ : MediaPlaybackTarget()
+ , m_outputContext(context)
</ins><span class="cx"> {
</span><del>- if ([getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
- [archiver encodeObject:m_devicePickerContext.get() forKey:deviceContextKey];
</del><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlaybackTarget::decode(NSKeyedUnarchiver *unarchiver, MediaPlaybackTarget& playbackTarget)
</del><ins>+MediaPlaybackTargetMac::~MediaPlaybackTargetMac()
</ins><span class="cx"> {
</span><del>- if (![getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
- return false;
</del><ins>+}
</ins><span class="cx">
</span><del>- AVOutputContext *context = nil;
- @try {
- context = [unarchiver decodeObjectOfClass:getAVOutputContextClass() forKey:deviceContextKey];
- } @catch (NSException *exception) {
- LOG_ERROR("The target picker being decoded is not a AVOutputContext.");
- return false;
- }
</del><ins>+const MediaPlaybackTargetContext& MediaPlaybackTargetMac::targetContext() const
+{
+ m_context.type = MediaPlaybackTargetContext::AVOutputContextType;
+ m_context.context.avOutputContext = m_outputContext.get();
</ins><span class="cx">
</span><del>- playbackTarget.m_devicePickerContext = context;
</del><ins>+ return m_context;
+}
</ins><span class="cx">
</span><del>- return true;
</del><ins>+bool MediaPlaybackTargetMac::hasActiveRoute() const
+{
+ return m_outputContext && m_outputContext.get().deviceName;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlaybackTarget::hasActiveRoute() const
</del><ins>+
+MediaPlaybackTargetMac* toMediaPlaybackTargetMac(MediaPlaybackTarget* rep)
</ins><span class="cx"> {
</span><del>- return m_devicePickerContext && m_devicePickerContext.get().deviceName;
</del><ins>+ return const_cast<MediaPlaybackTargetMac*>(toMediaPlaybackTargetMac(const_cast<const MediaPlaybackTarget*>(rep)));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+const MediaPlaybackTargetMac* toMediaPlaybackTargetMac(const MediaPlaybackTarget* rep)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(rep->targetType() == MediaPlaybackTarget::AVFoundation);
+ return static_cast<const MediaPlaybackTargetMac*>(rep);
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import <WebCore/AVFoundationSPI.h>
</span><span class="cx"> #import <WebCore/AVKitSPI.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><del>-#import <WebCore/MediaPlaybackTarget.h>
</del><ins>+#import <WebCore/MediaPlaybackTargetMac.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="lines">@@ -133,10 +133,7 @@
</span><span class="cx"> if (!devicePicker)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (devicePicker.isExternalOutputDevicePicked)
- m_client->didChoosePlaybackTarget(WebCore::MediaPlaybackTarget([devicePicker outputContext]));
- else
- m_client->didChoosePlaybackTarget(WebCore::MediaPlaybackTarget(nil));
</del><ins>+ m_client->didChoosePlaybackTarget(WebCore::MediaPlaybackTargetMac::create([devicePicker outputContext]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&) override;
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void startPlayingToPlaybackTarget() override;
</span><span class="cx"> virtual void stopPlayingToPlaybackTarget() override;
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> #import "OutOfBandTextTrackPrivateAVF.h"
</span><span class="cx"> #import "URL.h"
</span><span class="cx"> #import "Logging.h"
</span><del>-#import "MediaPlaybackTarget.h"
</del><ins>+#import "MediaPlaybackTargetMac.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">@@ -2777,9 +2777,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-void MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(const MediaPlaybackTarget& target)
</del><ins>+void MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><del>- m_outputContext = target.devicePickerContext();
</del><ins>+ MediaPlaybackTargetMac* macTarget = toMediaPlaybackTargetMac(&target.get());
+
+ m_outputContext = macTarget->outputContext();
</ins><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(%p) - target = %p", this, m_outputContext.get());
</span><span class="cx">
</span><span class="cx"> if (!m_outputContext || !m_outputContext.get().deviceName)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual bool isCurrentPlaybackTargetSupported() const override;
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&);
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</ins><span class="cx"> virtual void startPlayingToPlaybackTarget() override;
</span><span class="cx"> virtual void stopPlayingToPlaybackTarget() override;
</span><span class="cx"> void togglePlayingToPlaybackTarget();
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> mutable bool m_loadingProgressed;
</span><span class="cx"> bool m_hasAvailableVideoFrame;
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- std::unique_ptr<MediaPlaybackTarget> m_playbackTarget;
</del><ins>+ RefPtr<MediaPlaybackTarget> m_playbackTarget;
</ins><span class="cx"> bool m_currentPlaybackTargetIsSupported { true };
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -815,11 +815,9 @@
</span><span class="cx"> return !m_playbackTarget->hasActiveRoute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaSourceAVFObjC::setWirelessPlaybackTarget(const MediaPlaybackTarget& target)
</del><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><del>- if (!m_playbackTarget)
- m_playbackTarget = std::make_unique<MediaPlaybackTarget>();
- m_playbackTarget->setDevicePickerContext(target.devicePickerContext());
</del><ins>+ m_playbackTarget = WTF::move(target);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::togglePlayingToPlaybackTarget()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual bool isCurrentPlaybackTargetSupported() const override;
</span><del>- virtual void setWirelessPlaybackTarget(const MediaPlaybackTarget&);
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</ins><span class="cx"> virtual void startPlayingToPlaybackTarget() override;
</span><span class="cx"> virtual void stopPlayingToPlaybackTarget() override;
</span><span class="cx"> void togglePlayingToPlaybackTarget();
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> mutable MediaTime m_maxTimeLoadedAtLastDidLoadingProgress;
</span><span class="cx"> mutable FloatSize m_cachedNaturalSize;
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- std::unique_ptr<MediaPlaybackTarget> m_playbackTarget;
</del><ins>+ RefPtr<MediaPlaybackTarget> m_playbackTarget;
</ins><span class="cx"> bool m_currentPlaybackTargetIsSupported { true };
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1549,11 +1549,9 @@
</span><span class="cx"> return !m_playbackTarget->hasActiveRoute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::setWirelessPlaybackTarget(const MediaPlaybackTarget& target)
</del><ins>+void MediaPlayerPrivateQTKit::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><del>- if (!m_playbackTarget)
- m_playbackTarget = std::make_unique<MediaPlaybackTarget>();
- m_playbackTarget->setDevicePickerContext(target.devicePickerContext());
</del><ins>+ m_playbackTarget = WTF::move(target);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::togglePlayingToPlaybackTarget()
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-10 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Refactor MediaPlaybackTarget
+ https://bugs.webkit.org/show_bug.cgi?id=143571
+
+ Reviewed by Jer Noble.
+
+ * WebView/WebMediaPlaybackTargetPicker.h:
+ * WebView/WebMediaPlaybackTargetPicker.mm:
+ (WebMediaPlaybackTargetPicker::didChoosePlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.
+
</ins><span class="cx"> 2015-04-09 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Add a HAVE(AVKIT) and use it
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> void stopMonitoringPlaybackTargets();
</span><span class="cx">
</span><span class="cx"> // WebCore::MediaPlaybackTargetPicker::Client
</span><del>- virtual void didChoosePlaybackTarget(const WebCore::MediaPlaybackTarget&) override;
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<WebCore::MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) override;
</span><span class="cx">
</span><span class="cx"> void invalidate();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx"> targetPicker().stopMonitoringPlaybackTargets();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMediaPlaybackTargetPicker::didChoosePlaybackTarget(const WebCore::MediaPlaybackTarget& target)
</del><ins>+void WebMediaPlaybackTargetPicker::didChoosePlaybackTarget(Ref<WebCore::MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_page->didChoosePlaybackTarget(target);
</del><ins>+ m_page->didChoosePlaybackTarget(WTF::move(target));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::externalOutputDeviceAvailableDidChange(bool available)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-04-10 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Refactor MediaPlaybackTarget
+ https://bugs.webkit.org/show_bug.cgi?id=143571
+
+ Reviewed by Jer Noble.
+
+ Pass a MediaPlaybackTargetContext across process boundary instead of a MediaPlaybackTarget.
+ * Shared/WebCoreArgumentCoders.h:
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::encode): New.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::decode): New.
+ * Shared/mac/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData): New.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData): New.
+ (IPC::ArgumentCoder<MediaPlaybackTarget>::encode): Deleted.
+ (IPC::ArgumentCoder<MediaPlaybackTarget>::decode): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChoosePlaybackTarget): Take a Ref<MediaPlaybackTarget>&&.
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::playbackTargetSelected): Take a Ref<MediaPlaybackTarget>&&.
+
</ins><span class="cx"> 2015-04-10 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix some minor typos related to the WebProcessCreationParameter.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+#import <WebCore/MediaPlaybackTargetContext.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -2132,4 +2136,30 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+void ArgumentCoder<MediaPlaybackTargetContext>::encode(ArgumentEncoder& encoder, const MediaPlaybackTargetContext& target)
+{
+ int32_t targetType = target.type;
+ encoder << targetType;
+
+ if (!target.encodingRequiresPlatformData())
+ return;
+
+ encodePlatformData(encoder, target);
+}
+
+bool ArgumentCoder<MediaPlaybackTargetContext>::decode(ArgumentDecoder& decoder, MediaPlaybackTargetContext& target)
+{
+ int32_t targetType;
+ if (!decoder.decode(targetType))
+ return false;
+
+ target.type = static_cast<MediaPlaybackTargetContext::ContextType>(targetType);
+ if (!target.encodingRequiresPlatformData())
+ return false;
+
+ return decodePlatformData(decoder, target);
+}
+#endif
+
</ins><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> namespace WebCore {
</span><del>-class MediaPlaybackTarget;
</del><ins>+struct MediaPlaybackTargetContext;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -461,9 +461,11 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-template<> struct ArgumentCoder<WebCore::MediaPlaybackTarget> {
- static void encode(ArgumentEncoder&, const WebCore::MediaPlaybackTarget&);
- static bool decode(ArgumentDecoder&, WebCore::MediaPlaybackTarget&);
</del><ins>+template<> struct ArgumentCoder<WebCore::MediaPlaybackTargetContext> {
+ static void encode(ArgumentEncoder&, const WebCore::MediaPlaybackTargetContext&);
+ static bool decode(ArgumentDecoder&, WebCore::MediaPlaybackTargetContext&);
+ static void encodePlatformData(ArgumentEncoder&, const WebCore::MediaPlaybackTargetContext&);
+ static bool decodePlatformData(ArgumentDecoder&, WebCore::MediaPlaybackTargetContext&);
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -44,7 +44,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-#import <WebCore/MediaPlaybackTarget.h>
</del><ins>+#import <WebCore/AVFoundationSPI.h>
+#import <WebCore/MediaPlaybackTargetContext.h>
+#import <WebCore/SoftLinking.h>
+#import <objc/runtime.h>
+
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
+SOFT_LINK_CLASS(AVFoundation, AVOutputContext)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -437,26 +443,52 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-void ArgumentCoder<MediaPlaybackTarget>::encode(ArgumentEncoder& encoder, const MediaPlaybackTarget& target)
</del><ins>+
+static NSString *deviceContextKey()
</ins><span class="cx"> {
</span><ins>+ static NSString * const key = @"deviceContext";
+ return key;
+}
+
+void ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData(ArgumentEncoder& encoder, const MediaPlaybackTargetContext& target)
+{
+ ASSERT(target.type == MediaPlaybackTargetContext::AVOutputContextType);
+
</ins><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><del>- target.encode(archiver.get());
</del><ins>+
+ if ([getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
+ [archiver encodeObject:target.context.avOutputContext forKey:deviceContextKey()];
+
</ins><span class="cx"> [archiver finishEncoding];
</span><span class="cx"> IPC::encode(encoder, reinterpret_cast<CFDataRef>(data.get()));
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<MediaPlaybackTarget>::decode(ArgumentDecoder& decoder, MediaPlaybackTarget& target)
</del><ins>+bool ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData(ArgumentDecoder& decoder, MediaPlaybackTargetContext& target)
</ins><span class="cx"> {
</span><ins>+ ASSERT(target.type == MediaPlaybackTargetContext::AVOutputContextType);
+
+ if (![getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
+ return false;
+
</ins><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx"> if (!IPC::decode(decoder, data))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSKeyedUnarchiver> unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)data.get()]);
</span><span class="cx"> [unarchiver setRequiresSecureCoding:YES];
</span><del>- if (!MediaPlaybackTarget::decode(unarchiver.get(), target))
</del><ins>+
+ AVOutputContext *context = nil;
+ @try {
+ context = [unarchiver decodeObjectOfClass:getAVOutputContextClass() forKey:deviceContextKey()];
+ } @catch (NSException *exception) {
+ LOG_ERROR("The target picker being decoded is not a AVOutputContext.");
</ins><span class="cx"> return false;
</span><ins>+ }
+
+ target.context.avOutputContext = context;
</ins><span class="cx">
</span><span class="cx"> [unarchiver finishDecoding];
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -152,6 +152,10 @@
</span><span class="cx"> #include <WebCore/CairoUtilities.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+#include <WebCore/MediaPlaybackTarget.h>
+#endif
+
</ins><span class="cx"> // This controls what strategy we use for mouse wheel coalescing.
</span><span class="cx"> #define MERGE_WHEEL_EVENTS 1
</span><span class="cx">
</span><span class="lines">@@ -5719,12 +5723,12 @@
</span><span class="cx"> devicePickerProxy().stopMonitoringPlaybackTargets();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didChoosePlaybackTarget(const WebCore::MediaPlaybackTarget& target)
</del><ins>+void WebPageProxy::didChoosePlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::PlaybackTargetSelected(target), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::PlaybackTargetSelected(target->targetContext()), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::externalOutputDeviceAvailableDidChange(bool available)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> void stopMonitoringPlaybackTargets();
</span><span class="cx">
</span><span class="cx"> // WebCore::MediaPlaybackTargetPicker::Client
</span><del>- virtual void didChoosePlaybackTarget(const WebCore::MediaPlaybackTarget&) override;
</del><ins>+ virtual void didChoosePlaybackTarget(Ref<WebCore::MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx"> class HTMLPlugInImageElement;
</span><span class="cx"> class IntPoint;
</span><span class="cx"> class KeyboardEvent;
</span><del>-class MediaPlaybackTarget;
</del><span class="cx"> class Page;
</span><span class="cx"> class PrintContext;
</span><span class="cx"> class Range;
</span><span class="lines">@@ -139,6 +138,7 @@
</span><span class="cx"> class VisibleSelection;
</span><span class="cx"> struct Highlight;
</span><span class="cx"> struct KeypressCommand;
</span><ins>+struct MediaPlaybackTargetContext;
</ins><span class="cx"> struct TextCheckingResult;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1105,7 +1105,7 @@
</span><span class="cx"> void setShouldDispatchFakeMouseMoveEvents(bool dispatch) { m_shouldDispatchFakeMouseMoveEvents = dispatch; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>- void playbackTargetSelected(const WebCore::MediaPlaybackTarget& outputDevice) const;
</del><ins>+ void playbackTargetSelected(const WebCore::MediaPlaybackTargetContext& outputDevice) const;
</ins><span class="cx"> void playbackTargetAvailabilityDidChange(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -418,7 +418,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(WebCore::MediaPlaybackTarget target)
</del><ins>+ PlaybackTargetSelected(struct WebCore::MediaPlaybackTargetContext target)
</ins><span class="cx"> PlaybackTargetAvailabilityDidChange(bool available)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (182629 => 182630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-10 11:20:19 UTC (rev 182629)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-10 14:31:48 UTC (rev 182630)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-#include <WebCore/MediaPlaybackTarget.h>
</del><ins>+#include <WebCore/MediaPlaybackTargetMac.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -1228,9 +1228,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><del>-void WebPage::playbackTargetSelected(const WebCore::MediaPlaybackTarget& playbackTarget) const
</del><ins>+void WebPage::playbackTargetSelected(const WebCore::MediaPlaybackTargetContext& targetContext) const
</ins><span class="cx"> {
</span><del>- m_page->didChoosePlaybackTarget(playbackTarget);
</del><ins>+ ASSERT(targetContext.type == MediaPlaybackTargetContext::AVOutputContextType);
+
+ m_page->didChoosePlaybackTarget(WebCore::MediaPlaybackTargetMac::create(targetContext.context.avOutputContext));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::playbackTargetAvailabilityDidChange(bool changed)
</span></span></pre>
</div>
</div>
</body>
</html>