Title: [188348] trunk/Source
- Revision
- 188348
- Author
- [email protected]
- Date
- 2015-08-12 12:23:03 -0700 (Wed, 12 Aug 2015)
Log Message
Fixed the Release build when MEDIA_SESSION is enabled.
WebCore:
* testing/Internals.cpp:
(WebCore::interruptingCategoryFromString):
WebKit2:
* UIProcess/API/C/WKPage.cpp:
(WKPageHandleMediaEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188347 => 188348)
--- trunk/Source/WebCore/ChangeLog 2015-08-12 19:23:00 UTC (rev 188347)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 19:23:03 UTC (rev 188348)
@@ -1,3 +1,10 @@
+2015-08-12 Matt Rajca <[email protected]>
+
+ Fixed the Release build when MEDIA_SESSION is enabled.
+
+ * testing/Internals.cpp:
+ (WebCore::interruptingCategoryFromString):
+
2015-08-07 Matt Rajca <[email protected]>
Media Session: notify the UI process when media controls are enabled/disabled
Modified: trunk/Source/WebCore/testing/Internals.cpp (188347 => 188348)
--- trunk/Source/WebCore/testing/Internals.cpp 2015-08-12 19:23:00 UTC (rev 188347)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-08-12 19:23:03 UTC (rev 188348)
@@ -2796,6 +2796,7 @@
if (interruptingCategoryString == "transient-solo")
return MediaSessionInterruptingCategory::TransientSolo;
ASSERT_NOT_REACHED();
+ return MediaSessionInterruptingCategory::Content;
}
void Internals::sendMediaSessionStartOfInterruptionNotification(const String& interruptingCategoryString)
Modified: trunk/Source/WebKit2/ChangeLog (188347 => 188348)
--- trunk/Source/WebKit2/ChangeLog 2015-08-12 19:23:00 UTC (rev 188347)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-12 19:23:03 UTC (rev 188348)
@@ -1,3 +1,10 @@
+2015-08-12 Matt Rajca <[email protected]>
+
+ Fixed the Release build when MEDIA_SESSION is enabled.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageHandleMediaEvent):
+
2015-08-07 Matt Rajca <[email protected]>
Media Session: notify the UI process when media controls are enabled/disabled
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (188347 => 188348)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-08-12 19:23:00 UTC (rev 188347)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-08-12 19:23:03 UTC (rev 188348)
@@ -2186,6 +2186,7 @@
break;
default:
ASSERT_NOT_REACHED();
+ return;
}
toImpl(page)->handleMediaEvent(eventType);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
