Title: [172809] trunk/Source/WebCore
- Revision
- 172809
- Author
- [email protected]
- Date
- 2014-08-20 14:02:24 -0700 (Wed, 20 Aug 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (172808 => 172809)
--- 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)
@@ -1,5 +1,26 @@
2014-08-20 Eric Carlson <[email protected]>
+ 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 <[email protected]>
+
[MSE] add additional SourceBuffer and MediaSource logging
https://bugs.webkit.org/show_bug.cgi?id=136114
Modified: trunk/Source/WebCore/WebCore.exp.in (172808 => 172809)
--- 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)
@@ -820,7 +820,6 @@
__ZN7WebCore19LayerFlushSchedulerD2Ev
__ZN7WebCore19LayerRepresentation19retainPlatformLayerEP7CALayer
__ZN7WebCore19LayerRepresentation20releasePlatformLayerEP7CALayer
-__ZN7WebCore19MediaSessionManager12removeClientEPNS_25MediaSessionManagerClientE
__ZN7WebCore19MediaSessionManager12restrictionsENS_12MediaSession9MediaTypeE
__ZN7WebCore19MediaSessionManager13sharedManagerEv
__ZN7WebCore19MediaSessionManager14addRestrictionENS_12MediaSession9MediaTypeEj
@@ -828,7 +827,6 @@
__ZN7WebCore19MediaSessionManager17beginInterruptionENS_12MediaSession16InterruptionTypeE
__ZN7WebCore19MediaSessionManager17removeRestrictionENS_12MediaSession9MediaTypeEj
__ZN7WebCore19MediaSessionManager30didReceiveRemoteControlCommandENS_12MediaSession24RemoteControlCommandTypeE
-__ZN7WebCore19MediaSessionManager9addClientEPNS_25MediaSessionManagerClientE
__ZN7WebCore19ProtectionSpaceBaseC2ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES4_NS_35ProtectionSpaceAuthenticationSchemeE
__ZN7WebCore19ProtectionSpaceBaseC2Ev
__ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (172808 => 172809)
--- 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)
@@ -127,12 +127,6 @@
m_audioHardwareListener = AudioHardwareListener::create(*this);
updateSessionState();
-
- if (m_clients.isEmpty() || !(session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio))
- return;
-
- for (auto& client : m_clients)
- client->startListeningForRemoteControlCommands();
}
void MediaSessionManager::removeSession(MediaSession& session)
@@ -152,12 +146,6 @@
}
updateSessionState();
-
- if (m_clients.isEmpty() || !(session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio))
- return;
-
- for (auto& client : m_clients)
- client->startListeningForRemoteControlCommands();
}
void MediaSessionManager::addRestriction(MediaSession::MediaType type, SessionRestrictions restriction)
@@ -184,11 +172,6 @@
setCurrentSession(session);
- if (!m_clients.isEmpty() && (session.mediaType() == MediaSession::Video || session.mediaType() == MediaSession::Audio)) {
- for (auto& client : m_clients)
- client->didBeginPlayback();
- }
-
MediaSession::MediaType sessionType = session.mediaType();
SessionRestrictions restrictions = m_restrictions[sessionType];
if (!restrictions & ConcurrentPlaybackNotPermitted)
@@ -316,18 +299,6 @@
activeSession->didReceiveRemoteControlCommand(command);
}
-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));
-}
-
void MediaSessionManager::systemWillSleep()
{
if (m_interrupted)
Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (172808 => 172809)
--- 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)
@@ -40,19 +40,6 @@
class MediaSession;
class RemoteCommandListener;
-class MediaSessionManagerClient {
-public:
- virtual ~MediaSessionManagerClient() { }
-
- virtual bool isListeningForRemoteControlCommands() = 0;
- virtual void startListeningForRemoteControlCommands() = 0;
- virtual void stopListeningForRemoteControlCommands() = 0;
- virtual void didBeginPlayback() = 0;
-
-protected:
- MediaSessionManagerClient() { }
-};
-
class MediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {
public:
static MediaSessionManager& sharedManager();
@@ -95,9 +82,6 @@
virtual void stopMonitoringAirPlayRoutes() { }
#endif
- void addClient(MediaSessionManagerClient*);
- void removeClient(MediaSessionManagerClient*);
-
protected:
friend class MediaSession;
explicit MediaSessionManager();
@@ -113,7 +97,6 @@
void updateSessionState();
-
// RemoteCommandListenerClient
virtual void didReceiveRemoteControlCommand(MediaSession::RemoteControlCommandType) override;
@@ -129,7 +112,6 @@
SessionRestrictions m_restrictions[MediaSession::WebAudio + 1];
Vector<MediaSession*> m_sessions;
- Vector<MediaSessionManagerClient*> m_clients;
std::unique_ptr<RemoteCommandListener> m_remoteCommandListener;
std::unique_ptr<SystemSleepListener> m_systemSleepListener;
RefPtr<AudioHardwareListener> m_audioHardwareListener;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
