<!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>[195379] branches/safari-601-branch/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/195379">195379</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-20 14:18:54 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/189135">r189135</a> via <a href="http://trac.webkit.org/projects/webkit/changeset/195066">r195066</a>. rdar://problem/24154288</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagerh">branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach">branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacChangeLog">branches/safari-601-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm">branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2UIProcessmacPageClientImplmm">branches/safari-601-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -1,7 +1,11 @@
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><del>- Rollout r192200 via r195067. rdar://problem/24154288
</del><ins>+ Merge r195066. rdar://problem/24154288
</ins><span class="cx">
</span><ins>+ 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Rollout r192200 via r195067. rdar://problem/24154288
+
</ins><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r195068. rdar://problem/24154288
</span><span class="lines">@@ -45,32 +49,6 @@
</span><span class="cx"> * testing/Internals.cpp:
</span><span class="cx"> (WebCore::Internals::setMockMediaPlaybackTargetPickerState): Support new state.
</span><span class="cx">
</span><del>-2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
-
- Merge r189135. rdar://problem/24154288
-
- 2015-08-28 Eric Carlson <eric.carlson@apple.com>
-
- [Mac] Restructure WebMediaSessionManager for testing
- https://bugs.webkit.org/show_bug.cgi?id=148593
-
- Reviewed by Jer Noble.
-
- No new tests, no functional change.
-
- * Modules/mediasession/WebMediaSessionManager.cpp:
- (WebCore::mediaProducerStateString): Add some missing states.
- (WebCore::webMediaSessionManagerOverride): New.
- (WebCore::WebMediaSessionManager::singleton): New.
- (WebCore::WebMediaSessionManager::setWebMediaSessionManagerOverride): New, will allow runtime
- registration of a mock manager.
- * Modules/mediasession/WebMediaSessionManager.h:
-
- * platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp:
- (WebCore::WebMediaSessionManager::platformManager): Renamed from singleton.
- (WebCore::WebMediaSessionManagerMac::singleton): Deleted.
- * platform/graphics/avfoundation/WebMediaSessionManagerMac.h:
-
</del><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194927. rdar://problem/24101254
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -78,8 +78,6 @@
</span><span class="cx"> string.append("RequiresPlaybackTargetMonitoring + ");
</span><span class="cx"> if (flags & MediaProducer::ExternalDeviceAutoPlayCandidate)
</span><span class="cx"> string.append("ExternalDeviceAutoPlayCandidate + ");
</span><del>- if (flags & MediaProducer::DidPlayToEnd)
- string.append("DidPlayToEnd + ");
</del><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("IsNotPlaying");
</span><span class="cx"> else
</span><span class="lines">@@ -89,25 +87,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static WebMediaSessionManager*& webMediaSessionManagerOverride()
-{
- static WebMediaSessionManager* override;
- return override;
-}
-
-WebMediaSessionManager& WebMediaSessionManager::shared()
-{
- if (WebMediaSessionManager* override = webMediaSessionManagerOverride())
- return *override;
-
- return WebMediaSessionManager::platformManager();
-}
-
-void WebMediaSessionManager::setWebMediaSessionManagerOverride(WebMediaSessionManager* manager)
-{
- webMediaSessionManagerOverride() = manager;
-}
-
</del><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><span class="cx"> : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
</span><span class="cx"> , m_watchdogTimer(RunLoop::current(), this, &WebMediaSessionManager::watchdogTimerFired)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebMediaSessionManager);
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static WebMediaSessionManager& shared();
- WEBCORE_EXPORT static void setWebMediaSessionManagerOverride(WebMediaSessionManager*);
-
</del><span class="cx"> WEBCORE_EXPORT uint64_t addPlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removePlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removeAllPlaybackTargetPickerClients(WebMediaSessionManagerClient&);
</span><span class="lines">@@ -59,7 +56,6 @@
</span><span class="cx"> virtual ~WebMediaSessionManager();
</span><span class="cx">
</span><span class="cx"> virtual WebCore::MediaPlaybackTargetPicker& targetPicker() = 0;
</span><del>- static WebMediaSessionManager& platformManager();
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebMediaSessionManager& WebMediaSessionManager::platformManager()
</del><ins>+WebMediaSessionManager& WebMediaSessionManagerMac::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebMediaSessionManagerMac> sharedManager;
</span><span class="cx"> return sharedManager;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> class WebMediaSessionManagerMac : public WebMediaSessionManager {
</span><span class="cx"> friend class NeverDestroyed<WebMediaSessionManagerMac>;
</span><span class="cx"> public:
</span><ins>+ WEBCORE_EXPORT static WebMediaSessionManager& singleton();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebMediaSessionManagerMac();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r189135 via r195066. rdar://problem/24154288
+
+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Roll out r192200 via r195067. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebCore/MediaPlaybackTarget.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><del>-#import <WebCore/WebMediaSessionManager.h>
</del><ins>+#import <WebCore/WebMediaSessionManagerMac.h>
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebMediaPlaybackTargetPicker> WebMediaPlaybackTargetPicker::create(WebCore::Page& page)
</span><span class="cx"> {
</span><span class="lines">@@ -43,22 +43,22 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::addPlaybackTargetPickerClient(uint64_t contextId)
</span><span class="cx"> {
</span><del>- WebCore::WebMediaSessionManager::shared().addPlaybackTargetPickerClient(*this, contextId);
</del><ins>+ WebCore::WebMediaSessionManagerMac::singleton().addPlaybackTargetPickerClient(*this, contextId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::removePlaybackTargetPickerClient(uint64_t contextId)
</span><span class="cx"> {
</span><del>- WebCore::WebMediaSessionManager::shared().removePlaybackTargetPickerClient(*this, contextId);
</del><ins>+ WebCore::WebMediaSessionManagerMac::singleton().removePlaybackTargetPickerClient(*this, contextId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::showPlaybackTargetPicker(uint64_t contextId, const WebCore::FloatRect& rect, bool hasVideo)
</span><span class="cx"> {
</span><del>- WebCore::WebMediaSessionManager::shared().showPlaybackTargetPicker(*this, contextId, WebCore::IntRect(rect), hasVideo);
</del><ins>+ WebCore::WebMediaSessionManagerMac::singleton().showPlaybackTargetPicker(*this, contextId, WebCore::IntRect(rect), hasVideo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::playbackTargetPickerClientStateDidChange(uint64_t contextId, WebCore::MediaProducer::MediaStateFlags state)
</span><span class="cx"> {
</span><del>- WebCore::WebMediaSessionManager::shared().clientStateDidChange(*this, contextId, state);
</del><ins>+ WebCore::WebMediaSessionManagerMac::singleton().clientStateDidChange(*this, contextId, state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaPlaybackTargetPicker::setPlaybackTarget(uint64_t contextId, Ref<WebCore::MediaPlaybackTarget>&& target)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> void WebMediaPlaybackTargetPicker::invalidate()
</span><span class="cx"> {
</span><span class="cx"> m_page = nullptr;
</span><del>- WebCore::WebMediaSessionManager::shared().removeAllPlaybackTargetPickerClients(*this);
</del><ins>+ WebCore::WebMediaSessionManagerMac::singleton().removeAllPlaybackTargetPickerClients(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r189135 via r195066. rdar://problem/24154288
+
+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Roll out r192200 via r195067. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (195378 => 195379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2016-01-20 22:18:49 UTC (rev 195378)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2016-01-20 22:18:54 UTC (rev 195379)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-#include <WebCore/WebMediaSessionManager.h>
</del><ins>+#include <WebCore/WebMediaSessionManagerMac.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface NSApplication (WebNSApplicationDetails)
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> WebCore::WebMediaSessionManager& PageClientImpl::mediaSessionManager()
</span><span class="cx"> {
</span><del>- return WebMediaSessionManager::shared();
</del><ins>+ return WebMediaSessionManagerMac::singleton();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>