<!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>[172809] trunk/Source/WebCore</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/172809">172809</a></dd>

<dt>Author</dt> <dd>eric.carlson@apple.com</dd>

<dt>Date</dt> <dd>2014-08-20 14:02:24 -0700 (Wed, 20 Aug 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Cleanup MediaSession

https://bugs.webkit.org/show_bug.cgi?id=136116

Reviewed by Brent Fulgham.

MediaSessionManagerClient interface isn't used, remove it.

No new tests, this doesn't change behavior.

* WebCore.exp.in:

* platform/audio/MediaSessionManager.cpp:

(WebCore::MediaSessionManager::addSession):

(WebCore::MediaSessionManager::removeSession):

(WebCore::MediaSessionManager::sessionWillBeginPlayback):

(WebCore::MediaSessionManager::addClient): Deleted.

(WebCore::MediaSessionManager::removeClient): Deleted.

* platform/audio/MediaSessionManager.h:

(WebCore::MediaSessionManagerClient::~MediaSessionManagerClient): Deleted.

(WebCore::MediaSessionManagerClient::MediaSessionManagerClient): Deleted.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>

<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagerh">trunk/Source/WebCore/platform/audio/MediaSessionManager.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172808 => 172809)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-20 20:47:45 UTC (rev 172808)

+++ trunk/Source/WebCore/ChangeLog        2014-08-20 21:02:24 UTC (rev 172809)

</span><span class="lines">@@ -1,5 +1,26 @@

</span><span class="cx"> 2014-08-20  Eric Carlson  &lt;eric.carlson@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Cleanup MediaSession

+        https://bugs.webkit.org/show_bug.cgi?id=136116

+

+        Reviewed by Brent Fulgham.

+

+        MediaSessionManagerClient interface isn't used, remove it.

+        No new tests, this doesn't change behavior.

+

+        * WebCore.exp.in:

+        * platform/audio/MediaSessionManager.cpp:

+        (WebCore::MediaSessionManager::addSession): 

+        (WebCore::MediaSessionManager::removeSession):

+        (WebCore::MediaSessionManager::sessionWillBeginPlayback):

+        (WebCore::MediaSessionManager::addClient): Deleted.

+        (WebCore::MediaSessionManager::removeClient): Deleted.

+        * platform/audio/MediaSessionManager.h:

+        (WebCore::MediaSessionManagerClient::~MediaSessionManagerClient): Deleted.

+        (WebCore::MediaSessionManagerClient::MediaSessionManagerClient): Deleted.

+

+2014-08-20  Eric Carlson  &lt;eric.carlson@apple.com&gt;

+

</ins><span class="cx">         [MSE] add additional SourceBuffer and MediaSource logging

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=136114

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoreWebCoreexpin"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172808 => 172809)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-08-20 20:47:45 UTC (rev 172808)

+++ trunk/Source/WebCore/WebCore.exp.in        2014-08-20 21:02:24 UTC (rev 172809)

</span><span class="lines">@@ -820,7 +820,6 @@

</span><span class="cx"> __ZN7WebCore19LayerFlushSchedulerD2Ev

</span><span class="cx"> __ZN7WebCore19LayerRepresentation19retainPlatformLayerEP7CALayer

</span><span class="cx"> __ZN7WebCore19LayerRepresentation20releasePlatformLayerEP7CALayer

</span><del>-__ZN7WebCore19MediaSessionManager12removeClientEPNS_25MediaSessionManagerClientE

</del><span class="cx"> __ZN7WebCore19MediaSessionManager12restrictionsENS_12MediaSession9MediaTypeE

</span><span class="cx"> __ZN7WebCore19MediaSessionManager13sharedManagerEv

</span><span class="cx"> __ZN7WebCore19MediaSessionManager14addRestrictionENS_12MediaSession9MediaTypeEj

</span><span class="lines">@@ -828,7 +827,6 @@

</span><span class="cx"> __ZN7WebCore19MediaSessionManager17beginInterruptionENS_12MediaSession16InterruptionTypeE

</span><span class="cx"> __ZN7WebCore19MediaSessionManager17removeRestrictionENS_12MediaSession9MediaTypeEj

</span><span class="cx"> __ZN7WebCore19MediaSessionManager30didReceiveRemoteControlCommandENS_12MediaSession24RemoteControlCommandTypeE

</span><del>-__ZN7WebCore19MediaSessionManager9addClientEPNS_25MediaSessionManagerClientE

</del><span class="cx"> __ZN7WebCore19ProtectionSpaceBaseC2ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES4_NS_35ProtectionSpaceAuthenticationSchemeE

</span><span class="cx"> __ZN7WebCore19ProtectionSpaceBaseC2Ev

</span><span class="cx"> __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (172808 => 172809)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp        2014-08-20 20:47:45 UTC (rev 172808)

+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp        2014-08-20 21:02:24 UTC (rev 172809)

</span><span class="lines">@@ -127,12 +127,6 @@

</span><span class="cx">         m_audioHardwareListener = AudioHardwareListener::create(*this);

</span><span class="cx"> 

</span><span class="cx">     updateSessionState();

</span><del>-

-    if (m_clients.isEmpty() || !(session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio))

-        return;

-

-    for (auto&amp; client : m_clients)

-        client-&gt;startListeningForRemoteControlCommands();

</del><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void MediaSessionManager::removeSession(MediaSession&amp; session)

</span><span class="lines">@@ -152,12 +146,6 @@

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     updateSessionState();

</span><del>-

-    if (m_clients.isEmpty() || !(session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio))

-        return;

-

-    for (auto&amp; client : m_clients)

-        client-&gt;startListeningForRemoteControlCommands();

</del><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void MediaSessionManager::addRestriction(MediaSession::MediaType type, SessionRestrictions restriction)

</span><span class="lines">@@ -184,11 +172,6 @@

</span><span class="cx">     

</span><span class="cx">     setCurrentSession(session);

</span><span class="cx"> 

</span><del>-    if (!m_clients.isEmpty() &amp;&amp; (session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio)) {

-        for (auto&amp; client : m_clients)

-            client-&gt;didBeginPlayback();

-    }

-

</del><span class="cx">     MediaSession::MediaType sessionType = session.mediaType();

</span><span class="cx">     SessionRestrictions restrictions = m_restrictions[sessionType];

</span><span class="cx">     if (!restrictions &amp; ConcurrentPlaybackNotPermitted)

</span><span class="lines">@@ -316,18 +299,6 @@

</span><span class="cx">     activeSession-&gt;didReceiveRemoteControlCommand(command);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void MediaSessionManager::addClient(MediaSessionManagerClient* client)

-{

-    ASSERT(!m_clients.contains(client));

-    m_clients.append(client);

-}

-

-void MediaSessionManager::removeClient(MediaSessionManagerClient* client)

-{

-    ASSERT(m_clients.contains(client));

-    m_clients.remove(m_clients.find(client));

-}

-

</del><span class="cx"> void MediaSessionManager::systemWillSleep()

</span><span class="cx"> {

</span><span class="cx">     if (m_interrupted)

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (172808 => 172809)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h        2014-08-20 20:47:45 UTC (rev 172808)

+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h        2014-08-20 21:02:24 UTC (rev 172809)

</span><span class="lines">@@ -40,19 +40,6 @@

</span><span class="cx"> class MediaSession;

</span><span class="cx"> class RemoteCommandListener;

</span><span class="cx"> 

</span><del>-class MediaSessionManagerClient {

-public:

-    virtual ~MediaSessionManagerClient() { }

-

-    virtual bool isListeningForRemoteControlCommands() = 0;

-    virtual void startListeningForRemoteControlCommands() = 0;

-    virtual void stopListeningForRemoteControlCommands() = 0;

-    virtual void didBeginPlayback() = 0;

-

-protected:

-    MediaSessionManagerClient() { }

-};

-

</del><span class="cx"> class MediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {

</span><span class="cx"> public:

</span><span class="cx">     static MediaSessionManager&amp; sharedManager();

</span><span class="lines">@@ -95,9 +82,6 @@

</span><span class="cx">     virtual void stopMonitoringAirPlayRoutes() { }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    void addClient(MediaSessionManagerClient*);

-    void removeClient(MediaSessionManagerClient*);

-

</del><span class="cx"> protected:

</span><span class="cx">     friend class MediaSession;

</span><span class="cx">     explicit MediaSessionManager();

</span><span class="lines">@@ -113,7 +97,6 @@

</span><span class="cx"> 

</span><span class="cx">     void updateSessionState();

</span><span class="cx"> 

</span><del>-

</del><span class="cx">     // RemoteCommandListenerClient

</span><span class="cx">     virtual void didReceiveRemoteControlCommand(MediaSession::RemoteControlCommandType) override;

</span><span class="cx"> 

</span><span class="lines">@@ -129,7 +112,6 @@

</span><span class="cx">     SessionRestrictions m_restrictions[MediaSession::WebAudio + 1];

</span><span class="cx"> 

</span><span class="cx">     Vector&lt;MediaSession*&gt; m_sessions;

</span><del>-    Vector&lt;MediaSessionManagerClient*&gt; m_clients;

</del><span class="cx">     std::unique_ptr&lt;RemoteCommandListener&gt; m_remoteCommandListener;

</span><span class="cx">     std::unique_ptr&lt;SystemSleepListener&gt; m_systemSleepListener;

</span><span class="cx">     RefPtr&lt;AudioHardwareListener&gt; m_audioHardwareListener;

</span></span></pre>

</div>

</div>

</body>

</html>