Changeset 187256 in webkit

Timestamp:

Jul 23, 2015 3:02:07 PM (9 years ago)

Author:

mrajca@apple.com

Message:

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

Reviewed by Jer Noble.

We need to expose a media element's underlying media player's volume to tests so we can test ducking.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::playerVolume):

• html/HTMLMediaElement.h:
• testing/Internals.cpp:

(WebCore::Internals::mediaElementPlayerVolume):

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)
• testing/Internals.h (modified) (1 diff)
• testing/Internals.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-23  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add infrastructure for testing ducking https://bugs.webkit.org/show_bug.cgi?id=147080
+
+        Reviewed by Jer Noble.
+
+        We need to expose a media element's underlying media player's volume to tests so we can test ducking.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::playerVolume):
+        * html/HTMLMediaElement.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::mediaElementPlayerVolume):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-07-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6480 +6480 @@
 
 #if ENABLE(MEDIA_SESSION)
+double HTMLMediaElement::playerVolume() const
+{
+    return m_player ? m_player->volume() : 0;
+}
 
 MediaSession* HTMLMediaElement::session() const

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -421 +421 @@
 
 #if ENABLE(MEDIA_SESSION)
+    WEBCORE_EXPORT double playerVolume() const;
+
     const String& kind() const { return m_kind; }
     void setKind(const String& kind) { m_kind = kind; }

trunk/Source/WebCore/testing/Internals.cpp

@@ -2810 +2810 @@
     }
 }
+
+double Internals::mediaElementPlayerVolume(HTMLMediaElement* element) const
+{
+    ASSERT_ARG(element, element);
+    return element->playerVolume();
+}
 #endif // ENABLE(MEDIA_SESSION)
 

trunk/Source/WebCore/testing/Internals.h

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

trunk/Source/WebCore/testing/Internals.idl

@@ -362 +362 @@
     [Conditional=MEDIA_SESSION] void sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category);
     [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
+    [Conditional=MEDIA_SESSION] double mediaElementPlayerVolume(HTMLMediaElement element);
     [Conditional=VIDEO] void applicationWillEnterForeground();
     [Conditional=VIDEO] void applicationWillEnterBackground();