<!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>[192972] branches/safari-601.1.46-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/192972">192972</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-02 15:04:01 -0800 (Wed, 02 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187544">r187544</a>. rdar://problem/23395970</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomDocumentcpp">branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagerh">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-12-01  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r187544. rdar://problem/23395970
+
+    2015-07-29  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Avoid unnecessarily constructing PlatformMediaSessionManager on Document destruction
+            https://bugs.webkit.org/show_bug.cgi?id=147398
+
+            Reviewed by Jer Noble.
+
+            Only call PlatformMediaSessionManager::stopAllMediaPlaybackForProcess() in
+            destructors if an PlatformMediaSessionManager instance already exists, to
+            avoid constructing one unecessarily at that point.
+
+            * dom/Document.cpp:
+            (WebCore::Document::~Document):
+            * platform/audio/PlatformMediaSessionManager.cpp:
+            (WebCore::PlatformMediaSessionManager::sharedManager):
+            (WebCore::PlatformMediaSessionManager::sharedManagerIfExists):
+            * platform/audio/PlatformMediaSessionManager.h:
+            * platform/audio/ios/MediaSessionManagerIOS.mm:
+            (WebCore::PlatformMediaSessionManager::sharedManager):
+            (WebCore::PlatformMediaSessionManager::sharedManagerIfExists):
+
</ins><span class="cx"> 2015-12-01  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r192709.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -633,7 +633,8 @@
</span><span class="cx">     if (m_cachedResourceLoader-&gt;document() == this)
</span><span class="cx">         m_cachedResourceLoader-&gt;setDocument(nullptr);
</span><span class="cx"> 
</span><del>-    PlatformMediaSessionManager::sharedManager().stopAllMediaPlaybackForDocument(this);
</del><ins>+    if (auto* platformMediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists())
+        platformMediaSessionManager-&gt;stopAllMediaPlaybackForDocument(this);
</ins><span class="cx">     
</span><span class="cx">     // We must call clearRareData() here since a Document class inherits TreeScope
</span><span class="cx">     // as well as Node. See a comment on TreeScope.h for the reason.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -37,11 +37,19 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+static PlatformMediaSessionManager* platformMediaSessionManager = nullptr;
+
</ins><span class="cx"> PlatformMediaSessionManager&amp; PlatformMediaSessionManager::sharedManager()
</span><span class="cx"> {
</span><del>-    DEPRECATED_DEFINE_STATIC_LOCAL(PlatformMediaSessionManager, manager, ());
-    return manager;
</del><ins>+    if (!platformMediaSessionManager)
+        platformMediaSessionManager = new PlatformMediaSessionManager;
+    return *platformMediaSessionManager;
</ins><span class="cx"> }
</span><ins>+
+PlatformMediaSessionManager* PlatformMediaSessionManager::sharedManagerIfExists()
+{
+    return platformMediaSessionManager;
+}
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> PlatformMediaSessionManager::PlatformMediaSessionManager()
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/PlatformMediaSessionManager.h        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> class PlatformMediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+    WEBCORE_EXPORT static PlatformMediaSessionManager* sharedManagerIfExists();
</ins><span class="cx">     WEBCORE_EXPORT static PlatformMediaSessionManager&amp; sharedManager();
</span><span class="cx">     virtual ~PlatformMediaSessionManager() { }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -114,12 +114,20 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static MediaSessionManageriOS* platformMediaSessionManager = nullptr;
+
</ins><span class="cx"> PlatformMediaSessionManager&amp; PlatformMediaSessionManager::sharedManager()
</span><span class="cx"> {
</span><del>-    DEPRECATED_DEFINE_STATIC_LOCAL(MediaSessionManageriOS, manager, ());
-    return manager;
</del><ins>+    if (!platformMediaSessionManager)
+        platformMediaSessionManager = new MediaSessionManageriOS;
+    return *platformMediaSessionManager;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PlatformMediaSessionManager* PlatformMediaSessionManager::sharedManagerIfExists()
+{
+    return platformMediaSessionManager;
+}
+
</ins><span class="cx"> MediaSessionManageriOS::MediaSessionManageriOS()
</span><span class="cx">     : PlatformMediaSessionManager()
</span><span class="cx">     , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-01  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r187544. rdar://problem/23395970
+
+    2015-07-29  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Avoid unnecessarily constructing PlatformMediaSessionManager on Document destruction
+            https://bugs.webkit.org/show_bug.cgi?id=147398
+
+            Reviewed by Jer Noble.
+
+            Only call PlatformMediaSessionManager::stopAllMediaPlaybackForProcess() in
+            destructors if an PlatformMediaSessionManager instance already exists, to
+            avoid constructing one unecessarily at that point.
+
+            * WebProcess/WebProcess.cpp:
+            (WebKit::WebProcess::didClose):
+
</ins><span class="cx"> 2015-12-01  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r192742.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebProcess.cpp (192971 => 192972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebProcess.cpp        2015-12-02 23:01:23 UTC (rev 192971)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebProcess.cpp        2015-12-02 23:04:01 UTC (rev 192972)
</span><span class="lines">@@ -660,7 +660,8 @@
</span><span class="cx"> #endif    
</span><span class="cx"> 
</span><span class="cx">     // FIXME(146657): This explicit media stop command should not be necessary
</span><del>-    PlatformMediaSessionManager::sharedManager().stopAllMediaPlaybackForProcess();
</del><ins>+    if (auto* platformMediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists())
+        platformMediaSessionManager-&gt;stopAllMediaPlaybackForProcess();
</ins><span class="cx"> 
</span><span class="cx">     // The UI process closed this connection, shut down.
</span><span class="cx">     stopRunLoop();
</span></span></pre>
</div>
</div>

</body>
</html>