Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
diff --git a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
index 0251856f4ac5df6d6ded688d7c0c8496844a7f79..ed0ce08fe2432eb030b3e77041a3e9ef00c7576c 100644
--- a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -349,12 +349,26 @@ bool WebRuntimeFeatures::isMediaPlayerEnabled()
void WebRuntimeFeatures::enableMediaSource(bool enable)
{
- RuntimeEnabledFeatures::setMediaSourceEnabled(enable);
+ // FIXME: Change to setMediaSourceEnabled() once Chromium
+ // starts calling enableWebKitMediaSource().
+ RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
}
bool WebRuntimeFeatures::isMediaSourceEnabled()
{
- return RuntimeEnabledFeatures::mediaSourceEnabled();
+ // FIXME: Change to mediaSourceEnabled() once Chromium
+ // starts calling isWebKitMediaSourceEnabled()
+ return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
+}
+
+void WebRuntimeFeatures::enableWebKitMediaSource(bool enable)
+{
+ RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
+}
+
+bool WebRuntimeFeatures::isWebKitMediaSourceEnabled()
+{
+ return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
}
void WebRuntimeFeatures::enableMediaStream(bool enable)

Powered by Google App Engine
This is Rietveld 408576698