Changeset 187588 in webkit

Timestamp:

Jul 30, 2015 10:02:13 AM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: add infrastructure for testing media control events
​https://bugs.webkit.org/show_bug.cgi?id=147412

Reviewed by Eric Carlson.

• Modules/mediasession/MediaSessionManager.h:
• testing/Internals.cpp:

(WebCore::Internals::sendMediaControlEvent): Let tests simulate media control events.

• testing/Internals.h:
• testing/Internals.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaSessionManager.h (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)
• testing/Internals.h (modified) (1 diff)
• testing/Internals.idl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-29  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add infrastructure for testing media control events
+        https://bugs.webkit.org/show_bug.cgi?id=147412
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediasession/MediaSessionManager.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::sendMediaControlEvent): Let tests simulate media control events.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-07-30  Chris Dumez  <cdumez@apple.com>
 

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

@@ -42 +42 @@
     WEBCORE_EXPORT static MediaSessionManager& singleton();
 
-    void togglePlayback();
-    void skipToNextTrack();
-    void skipToPreviousTrack();
+    WEBCORE_EXPORT void togglePlayback();
+    WEBCORE_EXPORT void skipToNextTrack();
+    WEBCORE_EXPORT void skipToPreviousTrack();
 
     WEBCORE_EXPORT void didReceiveStartOfInterruptionNotification(MediaSessionInterruptingCategory) override;

trunk/Source/WebCore/testing/Internals.cpp

@@ -2822 +2822 @@
     return element->playerVolume();
 }
+
+void Internals::sendMediaControlEvent(const String& event)
+{
+    if (event == "play-pause")
+        MediaSessionManager::singleton().togglePlayback();
+    else if (event == "next-track")
+        MediaSessionManager::singleton().skipToNextTrack();
+    else if (event == "previous-track")
+        MediaSessionManager::singleton().skipToPreviousTrack();
+    else
+        ASSERT_NOT_REACHED();
+}
 #endif // ENABLE(MEDIA_SESSION)
 

trunk/Source/WebCore/testing/Internals.h

@@ -401 +401 @@
     String mediaSessionCurrentState(MediaSession*) const;
     double mediaElementPlayerVolume(HTMLMediaElement*) const;
+    void sendMediaControlEvent(const String&);
 #endif
 

trunk/Source/WebCore/testing/Internals.idl

@@ -52 +52 @@
 };
 
+enum MediaControlEvent {
+    "play-pause",
+    "next-track",
+    "previous-track"
+};
+
 [
     NoInterfaceObject,
@@ -364 +370 @@
     [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
     [Conditional=MEDIA_SESSION] double mediaElementPlayerVolume(HTMLMediaElement element);
+    [Conditional=MEDIA_SESSION] void sendMediaControlEvent(MediaControlEvent event);
     [Conditional=VIDEO] void applicationWillEnterForeground();
     [Conditional=VIDEO] void applicationWillEnterBackground();