Diff
Modified: trunk/Source/WebCore/ChangeLog (186790 => 186791)
--- trunk/Source/WebCore/ChangeLog 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebCore/ChangeLog 2015-07-13 22:51:15 UTC (rev 186791)
@@ -1,3 +1,16 @@
+2015-07-13 Matt Rajca <mra...@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.fra...@apple.com>
[iOS WK2] When choosing an initial viewport scale, take overflow on the <body> into account
Deleted: trunk/Source/WebCore/Modules/mediasession/MediaEventTypes.h (186790 => 186791)
--- trunk/Source/WebCore/Modules/mediasession/MediaEventTypes.h 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebCore/Modules/mediasession/MediaEventTypes.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaEventTypes_h
-#define MediaEventTypes_h
-
-#if ENABLE(MEDIA_SESSION)
-
-namespace WebCore {
-
-enum MediaEventType {
- PlayPause,
- TrackNext,
- TrackPrevious
-};
-
-}
-
-#endif
-
-#endif /* MediaEventTypes_h */
Copied: trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h (from rev 186786, trunk/Source/WebCore/Modules/mediasession/MediaEventTypes.h) (0 => 186791)
--- trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MediaSessionEvents_h
+#define MediaSessionEvents_h
+
+#if ENABLE(MEDIA_SESSION)
+
+namespace WebCore {
+
+enum MediaEventType {
+ PlayPause,
+ TrackNext,
+ TrackPrevious
+};
+
+enum MediaSessionInterruptionEvent {
+ StartOfInterruption,
+ EndOfInterruption
+};
+
+enum MediaSessionInterruptingCategory {
+ Content,
+ Transient,
+ TransientSolo
+};
+
+}
+
+#endif
+
+#endif /* MediaSessionEvents_h */
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186790 => 186791)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-13 22:51:15 UTC (rev 186791)
@@ -5720,7 +5720,7 @@
C968B2E81B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C968B2E71B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp */; };
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, ); }; };
CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */; };
@@ -13313,7 +13313,7 @@
C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionMetadata.h; sourceTree = "<group>"; };
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>"; };
CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAspectRatioValue.cpp; sourceTree = "<group>"; };
@@ -14659,13 +14659,13 @@
C968B2E71B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp */,
C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */,
C968B2E51B1E704500EF1F81 /* HTMLMediaElementMediaSession.idl */,
- C9F87CFD1B28E5F600979B83 /* MediaEventTypes.h */,
C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */,
C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */,
C93458BB1B18D77E0088EE12 /* MediaRemoteControls.idl */,
C9027F3F1B1D0AD200BFBFEF /* MediaSession.cpp */,
C9027F401B1D0AD200BFBFEF /* MediaSession.h */,
C9027F3E1B1D0AB900BFBFEF /* MediaSession.idl */,
+ C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */,
C90F65531B225396002163A1 /* MediaSessionManager.cpp */,
C90F65541B225396002163A1 /* MediaSessionManager.h */,
C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */,
@@ -25904,7 +25904,6 @@
FD6F252D13F5EF0E0065165F /* MediaElementAudioSourceNode.h in Headers */,
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 */,
A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */,
@@ -25932,6 +25931,7 @@
CEEFCD7A19DB31F7003876D7 /* MediaResourceLoader.h in Headers */,
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 */,
C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */,
Modified: trunk/Source/WebCore/page/Page.cpp (186790 => 186791)
--- trunk/Source/WebCore/page/Page.cpp 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebCore/page/Page.cpp 2015-07-13 22:51:15 UTC (rev 186791)
@@ -57,6 +57,7 @@
#include "MediaCanStartListener.h"
#include "Navigator.h"
#include "NetworkStateNotifier.h"
+#include "NotImplemented.h"
#include "PageCache.h"
#include "PageConfiguration.h"
#include "PageConsoleClient.h"
@@ -1224,6 +1225,11 @@
break;
}
}
+
+void Page::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
+{
+ notImplemented();
+}
#endif
#if !ASSERT_DISABLED
Modified: trunk/Source/WebCore/page/Page.h (186790 => 186791)
--- trunk/Source/WebCore/page/Page.h 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebCore/page/Page.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -55,7 +55,7 @@
#endif
#if ENABLE(MEDIA_SESSION)
-#include "MediaEventTypes.h"
+#include "MediaSessionEvents.h"
#endif
namespace JSC {
@@ -442,6 +442,7 @@
#if ENABLE(MEDIA_SESSION)
WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
+ WEBCORE_EXPORT void handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent, MediaSessionInterruptingCategory);
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebKit2/ChangeLog (186790 => 186791)
--- trunk/Source/WebKit2/ChangeLog 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-13 22:51:15 UTC (rev 186791)
@@ -1,3 +1,21 @@
+2015-07-13 Matt Rajca <mra...@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.fra...@apple.com>
[iOS WK2] When choosing an initial viewport scale, take overflow on the <body> into account
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186790 => 186791)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-13 22:51:15 UTC (rev 186791)
@@ -81,7 +81,7 @@
#if ENABLE(MEDIA_SESSION)
#include "WebMediaSessionMetadata.h"
-#include <WebCore/MediaEventTypes.h>
+#include <WebCore/MediaSessionEvents.h>
#endif
using namespace WebCore;
@@ -2189,6 +2189,56 @@
#endif
}
+#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)
{
toImpl(pageRef)->postMessageToInjectedBundle(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (186790 => 186791)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -118,8 +118,22 @@
};
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);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (186790 => 186791)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-13 22:51:15 UTC (rev 186791)
@@ -3784,6 +3784,14 @@
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
void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (186790 => 186791)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -942,6 +942,7 @@
#if ENABLE(MEDIA_SESSION)
bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
void handleMediaEvent(WebCore::MediaEventType);
+ void handleMediaSessionInterruptionEvent(WebCore::MediaSessionInterruptionEvent, WebCore::MediaSessionInterruptingCategory);
#endif
// WebPopupMenuProxy::Client
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186790 => 186791)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-13 22:51:15 UTC (rev 186791)
@@ -4043,6 +4043,11 @@
{
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
void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (186790 => 186791)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-13 22:51:15 UTC (rev 186791)
@@ -743,6 +743,7 @@
#if ENABLE(MEDIA_SESSION)
void handleMediaEvent(uint32_t /* WebCore::MediaEventType */);
+ void handleMediaSessionInterruptionEvent(uint32_t /* WebCore::MediaSessionInterruptionEvent */, uint32_t /* WebCore::MediaSessionInterruptingCategory */);
#endif
void updateMainFrameScrollOffsetPinning();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (186790 => 186791)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-13 22:38:39 UTC (rev 186790)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-13 22:51:15 UTC (rev 186791)
@@ -314,6 +314,7 @@
#if ENABLE(MEDIA_SESSION)
HandleMediaEvent(uint32_t eventType)
+ HandleMediaSessionInterruptionEvent(uint32_t event, uint32_t interruptingCategory)
#endif
// FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
