Changeset 187004 in webkit

Timestamp:

Jul 18, 2015 6:30:44 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: add infrastructure for testing interruptions
​https://bugs.webkit.org/show_bug.cgi?id=147060

Reviewed by Eric Carlson.

• Modules/mediasession/MediaSession.h: Export methods to be used with tests.
• Modules/mediasession/MediaSessionManager.h: Ditto.
• bindings/scripts/CodeGeneratorJS.pm: JSMediaSession needs to be marked with WEBCORE_EXPORT so it works with JSInternals.
• testing/Internals.cpp:

(WebCore::Internals::sendMediaSessionStartOfInterruptionNotification): Let tests send interruptions to MediaSessionManager.
(WebCore::Internals::sendMediaSessionEndOfInterruptionNotification): Ditto.
(WebCore::Internals::mediaSessionCurrentState): Expose the current state of media sessions to tests.

• testing/Internals.h:
• testing/Internals.idl: Add interfaces for sending interruptions from JS tests.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaSession.h (modified) (1 diff)
• Modules/mediasession/MediaSessionManager.h (modified) (2 diffs)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• testing/Internals.cpp (modified) (2 diffs)
• testing/Internals.h (modified) (2 diffs)
• testing/Internals.idl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-17  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add infrastructure for testing interruptions
+        https://bugs.webkit.org/show_bug.cgi?id=147060
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediasession/MediaSession.h: Export methods to be used with tests.
+        * Modules/mediasession/MediaSessionManager.h: Ditto.
+        * bindings/scripts/CodeGeneratorJS.pm: JSMediaSession needs to be marked with WEBCORE_EXPORT so it works with JSInternals.
+        * testing/Internals.cpp:
+        (WebCore::Internals::sendMediaSessionStartOfInterruptionNotification): Let tests send interruptions to MediaSessionManager.
+        (WebCore::Internals::sendMediaSessionEndOfInterruptionNotification): Ditto.
+        (WebCore::Internals::mediaSessionCurrentState): Expose the current state of media sessions to tests.
+        * testing/Internals.h:
+        * testing/Internals.idl: Add interfaces for sending interruptions from JS tests.
+
 2015-07-18  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.h

@@ -67 +67 @@
     MediaRemoteControls* controls(bool& isNull);
 
-    State currentState() const { return m_currentState; }
+    WEBCORE_EXPORT State currentState() const { return m_currentState; }
     bool hasActiveMediaElements() const;
 

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

@@ -40 +40 @@
     friend class NeverDestroyed<MediaSessionManager>;
 public:
-    static MediaSessionManager& singleton();
+    WEBCORE_EXPORT static MediaSessionManager& singleton();
 
     void togglePlayback();
@@ -46 +46 @@
     void skipToPreviousTrack();
 
-    void didReceiveStartOfInterruptionNotification(MediaSessionInterruptingCategory) override;
-    void didReceiveEndOfInterruptionNotification(MediaSessionInterruptingCategory) override;
+    WEBCORE_EXPORT void didReceiveStartOfInterruptionNotification(MediaSessionInterruptingCategory) override;
+    WEBCORE_EXPORT void didReceiveEndOfInterruptionNotification(MediaSessionInterruptingCategory) override;
 
 private:

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -247 +247 @@
     "JSHTMLElement" => 1,
     "JSHTMLMediaElement" => 1,
+    "JSMediaSession" => 1,
     "JSNode" => 1,
     "JSNotification" => 1,

trunk/Source/WebCore/testing/Internals.cpp

@@ -191 +191 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+#include "MediaSession.h"
+#include "MediaSessionManager.h"
+#endif
+
 using JSC::CodeBlock;
 using JSC::FunctionExecutable;
@@ -2759 +2764 @@
 #endif // ENABLE(VIDEO)
 
+#if ENABLE(MEDIA_SESSION)
+static MediaSessionInterruptingCategory interruptingCategoryFromString(const String& interruptingCategoryString)
+{
+    if (interruptingCategoryString == "content")
+        return MediaSessionInterruptingCategory::Content;
+    if (interruptingCategoryString == "transient")
+        return MediaSessionInterruptingCategory::Transient;
+    if (interruptingCategoryString == "transient-solo")
+        return MediaSessionInterruptingCategory::TransientSolo;
+    ASSERT_NOT_REACHED();
+}
+
+void Internals::sendMediaSessionStartOfInterruptionNotification(const String& interruptingCategoryString)
+{
+    MediaSessionManager::singleton().didReceiveStartOfInterruptionNotification(interruptingCategoryFromString(interruptingCategoryString));
+}
+
+void Internals::sendMediaSessionEndOfInterruptionNotification(const String& interruptingCategoryString)
+{
+    MediaSessionManager::singleton().didReceiveEndOfInterruptionNotification(interruptingCategoryFromString(interruptingCategoryString));
+}
+
+String Internals::mediaSessionCurrentState(MediaSession* session) const
+{
+    switch (session->currentState()) {
+    case MediaSession::State::Active:
+        return "active";
+    case MediaSession::State::Interrupted:
+        return "interrupted";
+    case MediaSession::State::Idle:
+        return "idle";
+    }
+}
+#endif // ENABLE(MEDIA_SESSION)
+
 #if ENABLE(WEB_AUDIO)
 void Internals::setAudioContextRestrictions(AudioContext* context, const String &restrictionsString, ExceptionCode &ec)

trunk/Source/WebCore/testing/Internals.h

@@ -57 +57 @@
 class InternalSettings;
 class MallocStatistics;
+class MediaSession;
 class MemoryInfo;
 class Node;
@@ -393 +394 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+    void sendMediaSessionStartOfInterruptionNotification(const String&);
+    void sendMediaSessionEndOfInterruptionNotification(const String&);
+    String mediaSessionCurrentState(MediaSession*) const;
+#endif
+
 #if ENABLE(WEB_AUDIO)
     void setAudioContextRestrictions(AudioContext*, const String& restrictions, ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -46 +46 @@
 };
 
+enum MediaSessionInterruptingCategory {
+    "content",
+    "transient",
+    "transient-solo"
+};
+
 [
     NoInterfaceObject,
@@ -352 +358 @@
     [Conditional=VIDEO] void beginMediaSessionInterruption();
     [Conditional=VIDEO] void endMediaSessionInterruption(DOMString flags);
+    [Conditional=MEDIA_SESSION] void sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory category);
+    [Conditional=MEDIA_SESSION] void sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category);
+    [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
     [Conditional=VIDEO] void applicationWillEnterForeground();
     [Conditional=VIDEO] void applicationWillEnterBackground();