diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 2 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 4 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 2 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index e2c3479..5001db1 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -864,7 +864,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableTouchEditing, switches::kEnableVsyncNotification, switches::kEnableWebPInAcceptHeader, - switches::kDisableMediaSource, + switches::kDisableWebKitMediaSource, switches::kEnableStrictSiteIsolation, switches::kDisableFullScreen, switches::kEnableNewDialogStyle, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index e561c9f..2cd0941 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -341,8 +341,8 @@ const char kEnableSkiaBenchmarking[] = "enable-skia-benchmarking"; // builds. const char kEnableLogging[] = "enable-logging"; -// Disable Media Source API on <audio>/<video> elements. -const char kDisableMediaSource[] = "disable-media-source"; +// Disable prefixed Media Source API (i.e., the WebKitMediaSource object). +const char kDisableWebKitMediaSource[] = "disable-webkit-media-source"; // Use fake device for MediaStream to replace actual camera and microphone. const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index c7bd6e7..ce13273 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -115,7 +115,7 @@ extern const char kEnableGpuClientTracing[]; extern const char kEnableMemoryBenchmarking[]; extern const char kEnableSkiaBenchmarking[]; CONTENT_EXPORT extern const char kEnableLogging[]; -extern const char kDisableMediaSource[]; +extern const char kDisableWebKitMediaSource[]; CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[]; extern const char kEnableMonitorProfile[]; extern const char kEnableUserMediaScreenCapturing[]; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 684feca..1543de8 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -637,7 +637,7 @@ void RenderThreadImpl::WidgetRestored() { static void AdjustRuntimeFeatureDefaultsForPlatform() { #if defined(OS_ANDROID) && !defined(GOOGLE_TV) - WebRuntimeFeatures::enableMediaSource(false); + WebRuntimeFeatures::enableWebKitMediaSource(false); #endif #if defined(OS_ANDROID) @@ -671,8 +671,8 @@ static void AdjustRuntimeFeaturesFromArgs(const CommandLine& command_line) { WebRuntimeFeatures::enableGeolocation(false); #if !defined(OS_ANDROID) || defined(GOOGLE_TV) - if (command_line.HasSwitch(switches::kDisableMediaSource)) - WebRuntimeFeatures::enableMediaSource(false); + if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) + WebRuntimeFeatures::enableWebKitMediaSource(false); #endif #if defined(OS_ANDROID) |