Changeset 188615 in webkit

Timestamp:

Aug 18, 2015 6:04:56 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: don't begin listening for interruptions when an interruption provider is created
​https://bugs.webkit.org/show_bug.cgi?id=148109

Reviewed by Eric Carlson.

If we call beginListeningForInterruption in MediaSessionInterruptionProvider's constructor, the current
class's implementation will get called, not implementations provided by subclasses (this makes sense since base
classes are initialized before derived classes). To fix this, we let clients of
MediaSessionInterruptionProvider start listening for interruptions instead. As a corollary of this, we can make
MediaSessionInterruptionProvider's methods pure virtual.

• Modules/mediasession/MediaSessionManager.cpp:

(WebCore::MediaSessionManager::MediaSessionManager):

• platform/mediasession/MediaSessionInterruptionProvider.h:
• platform/mediasession/MediaSessionInterruptionProvider.cpp:

(WebCore::MediaSessionInterruptionProvider::MediaSessionInterruptionProvider):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaSessionManager.cpp (modified) (1 diff)
• platform/mediasession/MediaSessionInterruptionProvider.cpp (modified) (1 diff)
• platform/mediasession/MediaSessionInterruptionProvider.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-17  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: don't begin listening for interruptions when an interruption provider is created
+        https://bugs.webkit.org/show_bug.cgi?id=148109
+
+        Reviewed by Eric Carlson.
+
+        If we call `beginListeningForInterruption` in MediaSessionInterruptionProvider's constructor, the current
+        class's implementation will get called, not implementations provided by subclasses (this makes sense since base
+        classes are initialized before derived classes). To fix this, we let clients of
+        MediaSessionInterruptionProvider start listening for interruptions instead. As a corollary of this, we can
+        make MediaSessionInterruptionProvider's methods pure virtual.
+
+        * Modules/mediasession/MediaSessionManager.cpp:
+        (WebCore::MediaSessionManager::MediaSessionManager):
+        * platform/mediasession/MediaSessionInterruptionProvider.h:
+        * platform/mediasession/MediaSessionInterruptionProvider.cpp:
+        (WebCore::MediaSessionInterruptionProvider::MediaSessionInterruptionProvider):
+
 2015-08-18  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp

@@ -46 +46 @@
 #if PLATFORM(MAC)
     m_interruptionProvider = adoptRef(new MediaSessionInterruptionProviderMac(*this));
+    m_interruptionProvider->beginListeningForInterruptions();
 #endif
 }

trunk/Source/WebCore/platform/mediasession/MediaSessionInterruptionProvider.cpp

@@ -34 +34 @@
     : m_client(&client)
 {
-    beginListeningForInterruptions();
 }
 
 MediaSessionInterruptionProvider::~MediaSessionInterruptionProvider()
 {
-    stopListeningForInterruptions();
-}
-
-void MediaSessionInterruptionProvider::beginListeningForInterruptions()
-{
-    ASSERT_NOT_REACHED();
-}
-
-void MediaSessionInterruptionProvider::stopListeningForInterruptions()
-{
-    ASSERT_NOT_REACHED();
 }
 

trunk/Source/WebCore/platform/mediasession/MediaSessionInterruptionProvider.h

@@ -54 +54 @@
 
     // To be overriden by subclasses.
-    virtual void beginListeningForInterruptions();
-    virtual void stopListeningForInterruptions();
+    virtual void beginListeningForInterruptions() = 0;
+    virtual void stopListeningForInterruptions() = 0;
 
     MediaSessionInterruptionProviderClient& client() const { return *m_client; }