Changeset 186791 in webkit

Timestamp:

Jul 13, 2015 3:51:15 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: add plumbing for delivering start/end-of-interruption events
​https://bugs.webkit.org/show_bug.cgi?id=146837

Reviewed by Tim Horton.

WebCore:

• Modules/mediasession/MediaSessionEvents.h: Renamed from MediaEventTypes.h and added new constants for interruption events.
• WebCore.xcodeproj/project.pbxproj: Renamed MediaEventTypes.h.
• page/Page.h: Added stub.
• page/Page.cpp: Added stub.

WebKit2: Added plumbing.

• UIProcess/API/C/WKPage.cpp:

(WKPageHandleMediaSessionInterruptionEvent):

• UIProcess/API/C/WKPagePrivate.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::handleMediaSessionInterruptionEvent):

• UIProcess/WebPageProxy.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::handleMediaSessionInterruptionEvent):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediasession/MediaSessionEvents.h (moved) (moved from trunk/Source/WebCore/Modules/mediasession/MediaEventTypes.h) (2 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPage.cpp (modified) (2 diffs)
• WebKit2/UIProcess/API/C/WKPagePrivate.h (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-13  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add plumbing for delivering start/end-of-interruption events
+        https://bugs.webkit.org/show_bug.cgi?id=146837
+
+        Reviewed by Tim Horton.
+
+        * Modules/mediasession/MediaSessionEvents.h: Renamed from MediaEventTypes.h and added new constants for
+          interruption events.
+        * WebCore.xcodeproj/project.pbxproj: Renamed MediaEventTypes.h.
+        * page/Page.h: Added stub.
+        * page/Page.cpp: Added stub.
+
 2015-07-13  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -24 +24 @@
  */
 
-#ifndef MediaEventTypes_h
-#define MediaEventTypes_h
+#ifndef MediaSessionEvents_h
+#define MediaSessionEvents_h
 
 #if ENABLE(MEDIA_SESSION)
@@ -37 +37 @@
 };
 
+enum MediaSessionInterruptionEvent {
+    StartOfInterruption,
+    EndOfInterruption
+};
+
+enum MediaSessionInterruptingCategory {
+    Content,
+    Transient,
+    TransientSolo
+};
+
 }
 
 #endif
 
-#endif /* MediaEventTypes_h */
+#endif /* MediaSessionEvents_h */

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5721 +5721 @@
                 C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 C9DADBCB1B1D3B97001F17D8 /* JSMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9DADBC91B1D3B25001F17D8 /* JSMediaSession.cpp */; };
-                C9F87CFE1B28F40E00979B83 /* MediaEventTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = C9F87CFD1B28E5F600979B83 /* MediaEventTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                C9F87CFE1B28F40E00979B83 /* MediaSessionEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 CA3BF67C10D99BAE00E6CE53 /* ScrollAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA3BF67B10D99BAE00E6CE53 /* ScrollAnimator.cpp */; };
                 CA3BF67E10D99BAE00E6CE53 /* ScrollAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -13314 +13314 @@
                 C9DADBC91B1D3B25001F17D8 /* JSMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaSession.cpp; sourceTree = "<group>"; };
                 C9DADBCA1B1D3B25001F17D8 /* JSMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaSession.h; sourceTree = "<group>"; };
-                C9F87CFD1B28E5F600979B83 /* MediaEventTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaEventTypes.h; sourceTree = "<group>"; };
+                C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = MediaSessionEvents.h; sourceTree = "<group>"; };
                 CA3BF67B10D99BAE00E6CE53 /* ScrollAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollAnimator.cpp; sourceTree = "<group>"; };
                 CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimator.h; sourceTree = "<group>"; };
@@ -14660 +14660 @@
                                 C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */,
                                 C968B2E51B1E704500EF1F81 /* HTMLMediaElementMediaSession.idl */,
-                                C9F87CFD1B28E5F600979B83 /* MediaEventTypes.h */,
                                 C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */,
                                 C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */,
@@ -14667 +14666 @@
                                 C9027F401B1D0AD200BFBFEF /* MediaSession.h */,
                                 C9027F3E1B1D0AB900BFBFEF /* MediaSession.idl */,
+                                C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */,
                                 C90F65531B225396002163A1 /* MediaSessionManager.cpp */,
                                 C90F65541B225396002163A1 /* MediaSessionManager.h */,
@@ -25905 +25905 @@
                                 07FE99DD18807A7D00256648 /* MediaElementSession.h in Headers */,
                                 E44613AD0CD6331000FADA75 /* MediaError.h in Headers */,
-                                C9F87CFE1B28F40E00979B83 /* MediaEventTypes.h in Headers */,
                                 4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */,
                                 07A6D1EC1491137700051D0C /* MediaFragmentURIParser.h in Headers */,
@@ -25933 +25932 @@
                                 CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */,
                                 C9027F421B1D0AD200BFBFEF /* MediaSession.h in Headers */,
+                                C9F87CFE1B28F40E00979B83 /* MediaSessionEvents.h in Headers */,
                                 C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */,
                                 07638A991884487200E15A1B /* MediaSessionManagerIOS.h in Headers */,

trunk/Source/WebCore/page/Page.cpp

@@ -58 +58 @@
 #include "Navigator.h"
 #include "NetworkStateNotifier.h"
+#include "NotImplemented.h"
 #include "PageCache.h"
 #include "PageConfiguration.h"
@@ -1225 +1226 @@
     }
 }
+
+void Page::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
+{
+    notImplemented();
+}
 #endif
 

trunk/Source/WebCore/page/Page.h

@@ -56 +56 @@
 
 #if ENABLE(MEDIA_SESSION)
-#include "MediaEventTypes.h"
+#include "MediaSessionEvents.h"
 #endif
 
@@ -443 +443 @@
 #if ENABLE(MEDIA_SESSION)
     WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
+    WEBCORE_EXPORT void handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent, MediaSessionInterruptingCategory);
 #endif
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-13  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add plumbing for delivering start/end-of-interruption events
+        https://bugs.webkit.org/show_bug.cgi?id=146837
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageHandleMediaSessionInterruptionEvent):
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::handleMediaSessionInterruptionEvent):
+        * UIProcess/WebPageProxy.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::handleMediaSessionInterruptionEvent):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2015-07-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -82 +82 @@
 #if ENABLE(MEDIA_SESSION)
 #include "WebMediaSessionMetadata.h"
-#include <WebCore/MediaEventTypes.h>
+#include <WebCore/MediaSessionEvents.h>
 #endif
 
@@ -2190 +2190 @@
 }
 
+#if ENABLE(MEDIA_SESSION)
+// NOTE: The values in the WKMediaSessionInterruptingCategory enum must stay in sync with those in WebCore::MediaSessionInterruptingCategory.
+COMPILE_ASSERT(MediaSessionInterruptingCategory::Content == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryContent), MediaSessionInterruptingCategoryEnumContent_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryContent);
+COMPILE_ASSERT(MediaSessionInterruptingCategory::Transient == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryTransient), MediaSessionInterruptingCategoryEnumTransient_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryTransient);
+COMPILE_ASSERT(MediaSessionInterruptingCategory::TransientSolo == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryTransientSolo), MediaSessionInterruptingCategoryEnumTransientSolo_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryTransientSolo);
+
+COMPILE_ASSERT(MediaSessionInterruptionEvent::StartOfInterruption == static_cast<MediaSessionInterruptionEvent>(kWKMediaSessionInterruptionEventStartOfInterruption), MediaSessionInterruptionEventEnumStartOfInterruption_Is_Wrong_Should_Be_kWKMediaSessionInterruptionEventStartOfInterruption);
+COMPILE_ASSERT(MediaSessionInterruptionEvent::EndOfInterruption == static_cast<MediaSessionInterruptionEvent>(kWKMediaSessionInterruptionEventEndOfInterruption), MediaSessionInterruptionEventEnumEndOfInterruption_Is_Wrong_Should_Be_kWKMediaSessionInterruptionEventEndOfInterruption);
+#endif
+
+void WKPageHandleMediaSessionInterruptionEvent(WKPageRef page, WKMediaSessionInterruptionEvent wkEvent, WKMediaSessionInterruptingCategory wkCategory)
+{
+#if ENABLE(MEDIA_SESSION)
+    MediaSessionInterruptingCategory category;
+
+    switch (wkCategory) {
+    case kWKMediaSessionInterruptingCategoryContent:
+        category = MediaSessionInterruptingCategory::Content;
+        break;
+    case kWKMediaSessionInterruptingCategoryTransient:
+        category = MediaSessionInterruptingCategory::Transient;
+        break;
+    case kWKMediaSessionInterruptingCategoryTransientSolo:
+        category = MediaSessionInterruptingCategory::TransientSolo;
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+
+    MediaSessionInterruptionEvent event;
+
+    switch (wkEvent) {
+    case kWKMediaSessionInterruptionEventStartOfInterruption:
+        event = MediaSessionInterruptionEvent::StartOfInterruption;
+        break;
+    case kWKMediaSessionInterruptionEventEndOfInterruption:
+        event = MediaSessionInterruptionEvent::EndOfInterruption;
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+
+    toImpl(page)->handleMediaSessionInterruptionEvent(event, category);
+#else
+    UNUSED_PARAM(page);
+    UNUSED_PARAM(wkEvent);
+    UNUSED_PARAM(wkCategory);
+#endif
+}
+
 void WKPagePostMessageToInjectedBundle(WKPageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h

@@ -119 +119 @@
 typedef uint32_t WKMediaEventType;
 
+enum {
+    kWKMediaSessionInterruptingCategoryContent,
+    kWKMediaSessionInterruptingCategoryTransient,
+    kWKMediaSessionInterruptingCategoryTransientSolo
+};
+typedef uint32_t WKMediaSessionInterruptingCategory;
+
+enum {
+    kWKMediaSessionInterruptionEventStartOfInterruption,
+    kWKMediaSessionInterruptionEventEndOfInterruption
+};
+typedef uint32_t WKMediaSessionInterruptionEvent;
+
 WK_EXPORT bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page);
 WK_EXPORT void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType event);
+WK_EXPORT void WKPageHandleMediaSessionInterruptionEvent(WKPageRef page, WKMediaSessionInterruptionEvent event, WKMediaSessionInterruptingCategory category);
 
 WK_EXPORT void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef page, WKURLRef url, bool shouldOpenExternalURLs);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -3785 +3785 @@
     m_process->send(Messages::WebPage::HandleMediaEvent(eventType), m_pageID);
 }
+
+void WebPageProxy::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
+{
+    if (!isValid())
+        return;
+
+    m_process->send(Messages::WebPage::HandleMediaSessionInterruptionEvent(event, category), m_pageID);
+}
 #endif
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -943 +943 @@
     bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
     void handleMediaEvent(WebCore::MediaEventType);
+    void handleMediaSessionInterruptionEvent(WebCore::MediaSessionInterruptionEvent, WebCore::MediaSessionInterruptingCategory);
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4044 +4044 @@
     m_page->handleMediaEvent(static_cast<MediaEventType>(eventType));
 }
+
+void WebPage::handleMediaSessionInterruptionEvent(uint32_t event, uint32_t category)
+{
+    m_page->handleMediaSessionInterruptionEvent(static_cast<MediaSessionInterruptionEvent>(event), static_cast<MediaSessionInterruptingCategory>(category));
+}
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -744 +744 @@
 #if ENABLE(MEDIA_SESSION)
     void handleMediaEvent(uint32_t /* WebCore::MediaEventType */);
+    void handleMediaSessionInterruptionEvent(uint32_t /* WebCore::MediaSessionInterruptionEvent */, uint32_t /* WebCore::MediaSessionInterruptingCategory */);
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -315 +315 @@
 #if ENABLE(MEDIA_SESSION)
     HandleMediaEvent(uint32_t eventType)
+    HandleMediaSessionInterruptionEvent(uint32_t event, uint32_t interruptingCategory)
 #endif