Diff
Modified: trunk/Source/WebCore/ChangeLog (186912 => 186913)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
@@ -1,3 +1,17 @@
+2015-07-16 Matt Rajca <[email protected]>
+
+ Media Session: remove plumbing for delivering start/end-of-interruption events
+ https://bugs.webkit.org/show_bug.cgi?id=147005
+
+ Reviewed by Eric Carlson.
+
+ Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+ so the same behavior is available to all clients.
+
+ * Modules/mediasession/MediaSessionEvents.h:
+ * page/Page.cpp:
+ * page/Page.h:
+
2015-07-16 Alex Christensen <[email protected]>
[Content Extensions] Cache domain actions
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h (186912 => 186913)
--- trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -36,17 +36,6 @@
TrackPrevious
};
-enum MediaSessionInterruptionEvent {
- StartOfInterruption,
- EndOfInterruption
-};
-
-enum MediaSessionInterruptingCategory {
- Content,
- Transient,
- TransientSolo
-};
-
}
#endif
Modified: trunk/Source/WebCore/page/Page.cpp (186912 => 186913)
--- trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:27:30 UTC (rev 186913)
@@ -57,7 +57,6 @@
#include "MediaCanStartListener.h"
#include "Navigator.h"
#include "NetworkStateNotifier.h"
-#include "NotImplemented.h"
#include "PageCache.h"
#include "PageConfiguration.h"
#include "PageConsoleClient.h"
@@ -1225,11 +1224,6 @@
break;
}
}
-
-void Page::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
-{
- notImplemented();
-}
#endif
#if !ASSERT_DISABLED
Modified: trunk/Source/WebCore/page/Page.h (186912 => 186913)
--- trunk/Source/WebCore/page/Page.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -442,7 +442,6 @@
#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 (186912 => 186913)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
@@ -1,3 +1,21 @@
+2015-07-16 Matt Rajca <[email protected]>
+
+ Media Session: remove plumbing for delivering start/end-of-interruption events
+ https://bugs.webkit.org/show_bug.cgi?id=147005
+
+ Reviewed by Eric Carlson.
+
+ Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+ so the same behavior is available to all clients.
+
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2015-07-16 Michael Catanzaro <[email protected]>
REGRESSION(r186464): [SOUP] ASSERTION FAILED: !m_messageReceiverMapCount when closing any tab
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186912 => 186913)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-16 22:27:30 UTC (rev 186913)
@@ -2189,56 +2189,6 @@
#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 (186912 => 186913)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -118,22 +118,8 @@
};
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 (186912 => 186913)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-16 22:27:30 UTC (rev 186913)
@@ -3878,14 +3878,6 @@
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 (186912 => 186913)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -943,7 +943,6 @@
#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 (186912 => 186913)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-16 22:27:30 UTC (rev 186913)
@@ -4043,11 +4043,6 @@
{
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 (186912 => 186913)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -744,7 +744,6 @@
#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 (186912 => 186913)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-16 22:27:30 UTC (rev 186913)
@@ -315,7 +315,6 @@
#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
