<!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>[189135] 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/189135">189135</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 17:14:54 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Restructure WebMediaSessionManager for testing
https://bugs.webkit.org/show_bug.cgi?id=148593
Reviewed by Jer Noble.
Source/WebCore:
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:
Source/WebKit/mac:
* WebView/WebMediaPlaybackTargetPicker.mm:
(WebMediaPlaybackTargetPicker::addPlaybackTargetPickerClient): Call WebMediaSessionManager::singleton,
not WebMediaSessionManagerMac::singleton.
(WebMediaPlaybackTargetPicker::removePlaybackTargetPickerClient): Ditto.
(WebMediaPlaybackTargetPicker::showPlaybackTargetPicker): Ditto.
(WebMediaPlaybackTargetPicker::playbackTargetPickerClientStateDidChange): Ditto.
(WebMediaPlaybackTargetPicker::setPlaybackTarget): Ditto.
(WebMediaPlaybackTargetPicker::invalidate): Ditto.
Source/WebKit2:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::mediaSessionManager): Call WebMediaSessionManager::singleton, not
WebMediaSessionManagerMac::singleton.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach">trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebCore/ChangeLog 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-08-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add WebKit/WebKit2 settings to control automatic data loading
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> string.append("RequiresPlaybackTargetMonitoring + ");
</span><span class="cx"> if (flags & MediaProducer::ExternalDeviceAutoPlayCandidate)
</span><span class="cx"> string.append("ExternalDeviceAutoPlayCandidate + ");
</span><ins>+ if (flags & MediaProducer::DidPlayToEnd)
+ string.append("DidPlayToEnd + ");
</ins><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("IsNotPlaying");
</span><span class="cx"> else
</span><span class="lines">@@ -87,6 +89,25 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><span class="cx"> : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
</span><span class="cx"> , m_watchdogTimer(RunLoop::current(), this, &WebMediaSessionManager::watchdogTimerFired)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebMediaSessionManager);
</span><span class="cx"> public:
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT static WebMediaSessionManager& shared();
+ WEBCORE_EXPORT static void setWebMediaSessionManagerOverride(WebMediaSessionManager*);
+
</ins><span class="cx"> WEBCORE_EXPORT uint64_t addPlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removePlaybackTargetPickerClient(WebMediaSessionManagerClient&, uint64_t);
</span><span class="cx"> WEBCORE_EXPORT void removeAllPlaybackTargetPickerClients(WebMediaSessionManagerClient&);
</span><span class="lines">@@ -56,6 +59,7 @@
</span><span class="cx"> virtual ~WebMediaSessionManager();
</span><span class="cx">
</span><span class="cx"> virtual WebCore::MediaPlaybackTargetPicker& targetPicker() = 0;
</span><ins>+ static WebMediaSessionManager& platformManager();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2015-08-29 00:14:54 UTC (rev 189135)
</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& WebMediaSessionManagerMac::singleton()
</del><ins>+WebMediaSessionManager& WebMediaSessionManager::platformManager()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebMediaSessionManagerMac> sharedManager;
</span><span class="cx"> return sharedManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.h 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> class WebMediaSessionManagerMac : public WebMediaSessionManager {
</span><span class="cx"> friend class NeverDestroyed<WebMediaSessionManagerMac>;
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static WebMediaSessionManager& singleton();
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebMediaSessionManagerMac();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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.
+
+ * WebView/WebMediaPlaybackTargetPicker.mm:
+ (WebMediaPlaybackTargetPicker::addPlaybackTargetPickerClient): Call WebMediaSessionManager::singleton,
+ not WebMediaSessionManagerMac::singleton.
+ (WebMediaPlaybackTargetPicker::removePlaybackTargetPickerClient): Ditto.
+ (WebMediaPlaybackTargetPicker::showPlaybackTargetPicker): Ditto.
+ (WebMediaPlaybackTargetPicker::playbackTargetPickerClientStateDidChange): Ditto.
+ (WebMediaPlaybackTargetPicker::setPlaybackTarget): Ditto.
+ (WebMediaPlaybackTargetPicker::invalidate): Ditto.
+
</ins><span class="cx"> 2015-08-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add WebKit/WebKit2 settings to control automatic data loading
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebMediaPlaybackTargetPickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebKit/mac/WebView/WebMediaPlaybackTargetPicker.mm 2015-08-29 00:14:54 UTC (rev 189135)
</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/WebMediaSessionManagerMac.h>
</del><ins>+#import <WebCore/WebMediaSessionManager.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::WebMediaSessionManagerMac::singleton().addPlaybackTargetPickerClient(*this, contextId);
</del><ins>+ WebCore::WebMediaSessionManager::shared().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::WebMediaSessionManagerMac::singleton().removePlaybackTargetPickerClient(*this, contextId);
</del><ins>+ WebCore::WebMediaSessionManager::shared().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::WebMediaSessionManagerMac::singleton().showPlaybackTargetPicker(*this, contextId, WebCore::IntRect(rect), hasVideo);
</del><ins>+ WebCore::WebMediaSessionManager::shared().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::WebMediaSessionManagerMac::singleton().clientStateDidChange(*this, contextId, state);
</del><ins>+ WebCore::WebMediaSessionManager::shared().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::WebMediaSessionManagerMac::singleton().removeAllPlaybackTargetPickerClients(*this);
</del><ins>+ WebCore::WebMediaSessionManager::shared().removeAllPlaybackTargetPickerClients(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::mediaSessionManager): Call WebMediaSessionManager::singleton, not
+ WebMediaSessionManagerMac::singleton.
+
</ins><span class="cx"> 2015-08-28 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add WebKit/WebKit2 settings to control automatic data loading
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (189134 => 189135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-08-29 00:10:07 UTC (rev 189134)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-08-29 00:14:54 UTC (rev 189135)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-#include <WebCore/WebMediaSessionManagerMac.h>
</del><ins>+#include <WebCore/WebMediaSessionManager.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface NSApplication (WebNSApplicationDetails)
</span><span class="lines">@@ -818,7 +818,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 WebMediaSessionManagerMac::singleton();
</del><ins>+ return WebMediaSessionManager::shared();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>