<!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>[186396] 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/186396">186396</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 20:40:19 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure media playback is stopped during page close
https://bugs.webkit.org/show_bug.cgi?id=146554
<rdar://problem/18033944>
Reviewed by Brady Eidson.
Source/WebCore:
* Modules/webaudio/AudioContext.cpp:
(WebCore::WebAudio::hostingDocument): Added.
* Modules/webaudio/AudioContext.h:
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::hostingDocument): Added.
* dom/Document.cpp:
(WebCore::Document::~Document): Call new 'stopAllMediaPlaybackForDocument' at destruction time.
* platform/audio/PlatformMediaSession.h:
Made PlatformMediaSessionManager a friend so it can access the protected 'client' accessor.
Updated PlatformMediaSessionClient to require clients to have a "hostingDocument" member.
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForDocument): Added. Only pauses
playback on elements that match the provided document.
(WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForProcess): Added. Pauses playback
on all elements in the current process.
* platform/audio/PlatformMediaSessionManager.h:
Source/WebKit2:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::didClose): Make sure to clean up any running media sessions when
the process is being shut down.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContexth">trunk/Source/WebCore/Modules/webaudio/AudioContext.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionh">trunk/Source/WebCore/platform/audio/PlatformMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/ChangeLog 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-06 Brent Fulgham <bfulgham@apple.com>
+
+ Ensure media playback is stopped during page close
+ https://bugs.webkit.org/show_bug.cgi?id=146554
+ <rdar://problem/18033944>
+
+ Reviewed by Brady Eidson.
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::WebAudio::hostingDocument): Added.
+ * Modules/webaudio/AudioContext.h:
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::hostingDocument): Added.
+ * dom/Document.cpp:
+ (WebCore::Document::~Document): Call new 'stopAllMediaPlaybackForDocument' at destruction time.
+ * platform/audio/PlatformMediaSession.h:
+ Made PlatformMediaSessionManager a friend so it can access the protected 'client' accessor.
+ Updated PlatformMediaSessionClient to require clients to have a "hostingDocument" member.
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForDocument): Added. Only pauses
+ playback on elements that match the provided document.
+ (WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForProcess): Added. Pauses playback
+ on all elements in the current process.
+ * platform/audio/PlatformMediaSessionManager.h:
+
</ins><span class="cx"> 2015-07-06 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Isolated worlds should respect Content Security Policy; User Agent Shadow DOM
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -370,6 +370,11 @@
</span><span class="cx"> return downcast<Document>(m_scriptExecutionContext);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const Document* AudioContext::hostingDocument() const
+{
+ return downcast<Document>(m_scriptExecutionContext);
+}
+
</ins><span class="cx"> PassRefPtr<AudioBuffer> AudioContext::createBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AudioBuffer> audioBuffer = AudioBuffer::create(numberOfChannels, numberOfFrames, sampleRate);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -90,6 +90,8 @@
</span><span class="cx">
</span><span class="cx"> Document* document() const; // ASSERTs if document no longer exists.
</span><span class="cx">
</span><ins>+ const Document* hostingDocument() const override;
+
</ins><span class="cx"> AudioDestinationNode* destination() { return m_destinationNode.get(); }
</span><span class="cx"> size_t currentSampleFrame() const { return m_destinationNode->currentSampleFrame(); }
</span><span class="cx"> double currentTime() const { return m_destinationNode->currentTime(); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "PageTransitionEvent.h"
</span><span class="cx"> #include "PlatformLocale.h"
</span><ins>+#include "PlatformMediaSessionManager.h"
</ins><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "PlugInsResources.h"
</span><span class="cx"> #include "PluginDocument.h"
</span><span class="lines">@@ -632,6 +633,8 @@
</span><span class="cx"> if (m_cachedResourceLoader->document() == this)
</span><span class="cx"> m_cachedResourceLoader->setDocument(nullptr);
</span><span class="cx">
</span><ins>+ PlatformMediaSessionManager::sharedManager().stopAllMediaPlaybackForDocument(this);
+
</ins><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 class="cx"> if (hasRareData())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -147,7 +147,9 @@
</span><span class="cx"> MediaPlayerEnums::MovieLoadType movieLoadType() const;
</span><span class="cx">
</span><span class="cx"> bool inActiveDocument() const { return m_inActiveDocument; }
</span><del>-
</del><ins>+
+ const Document* hostingDocument() const override { return &document(); }
+
</ins><span class="cx"> // DOM API
</span><span class="cx"> // error state
</span><span class="cx"> PassRefPtr<MediaError> error() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
</ins><span class="cx"> class MediaPlaybackTarget;
</span><span class="cx"> class PlatformMediaSessionClient;
</span><span class="cx">
</span><span class="lines">@@ -145,6 +146,8 @@
</span><span class="cx"> State m_stateToRestore;
</span><span class="cx"> int m_interruptionCount { 0 };
</span><span class="cx"> bool m_notifyingClient;
</span><ins>+
+ friend class PlatformMediaSessionManager;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class PlatformMediaSessionClient {
</span><span class="lines">@@ -177,6 +180,8 @@
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) { }
</span><span class="cx">
</span><ins>+ virtual const Document* hostingDocument() const = 0;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~PlatformMediaSessionClient() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><span class="cx"> #include "AudioSession.h"
</span><ins>+#include "Document.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PlatformMediaSession.h"
</span><span class="lines">@@ -329,6 +330,22 @@
</span><span class="cx"> updateSessionState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformMediaSessionManager::stopAllMediaPlaybackForDocument(const Document* document)
+{
+ Vector<PlatformMediaSession*> sessions = m_sessions;
+ for (auto* session : sessions) {
+ if (session->client().hostingDocument() == document)
+ session->pauseSession();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformMediaSessionManager::stopAllMediaPlaybackForProcess()
+{
+ Vector<PlatformMediaSession*> sessions = m_sessions;
+ for (auto* session : sessions)
+ session->pauseSession();
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
</ins><span class="cx"> class HTMLMediaElement;
</span><span class="cx"> class PlatformMediaSession;
</span><span class="cx"> class RemoteCommandListener;
</span><span class="lines">@@ -56,6 +57,9 @@
</span><span class="cx"> WEBCORE_EXPORT void applicationWillEnterForeground() const;
</span><span class="cx"> WEBCORE_EXPORT void applicationWillEnterBackground() const;
</span><span class="cx">
</span><ins>+ void stopAllMediaPlaybackForDocument(const Document*);
+ WEBCORE_EXPORT void stopAllMediaPlaybackForProcess();
+
</ins><span class="cx"> enum SessionRestrictionFlags {
</span><span class="cx"> NoRestrictions = 0,
</span><span class="cx"> ConcurrentPlaybackNotPermitted = 1 << 0,
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-06 Brent Fulgham <bfulgham@apple.com>
+
+ Ensure media playback is stopped during page close
+ https://bugs.webkit.org/show_bug.cgi?id=146554
+ <rdar://problem/18033944>
+
+ Reviewed by Brady Eidson.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didClose): Make sure to clean up any running media sessions when
+ the process is being shut down.
+
</ins><span class="cx"> 2015-07-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r186385.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (186395 => 186396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-07 03:12:14 UTC (rev 186395)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-07 03:40:19 UTC (rev 186396)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PageCache.h>
</span><span class="cx"> #include <WebCore/PageGroup.h>
</span><ins>+#include <WebCore/PlatformMediaSessionManager.h>
</ins><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="cx"> #include <WebCore/RuntimeEnabledFeatures.h>
</span><span class="cx"> #include <WebCore/SchemeRegistry.h>
</span><span class="lines">@@ -658,6 +659,9 @@
</span><span class="cx"> MemoryCache::singleton().setDisabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // FIXME(146657): This explicit media stop command should not be necessary
+ PlatformMediaSessionManager::sharedManager().stopAllMediaPlaybackForProcess();
+
</ins><span class="cx"> // The UI process closed this connection, shut down.
</span><span class="cx"> stopRunLoop();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>