diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 7 | ||||
| -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 |
7 files changed, 18 insertions, 17 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index c59cb19..9aa46c7 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6701,11 +6701,11 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION" desc="Description for the flag to enable asynchronous DNS client."> Enable experimental asynchronous DNS client. </message> - <message name="IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to disable the Media Source API on <video> elements."> - Disable Media Source API on <ph name="VIDEO_HTML"><video><ex><video></ex></ph> elements. + <message name="IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME" desc="Title for the flag to disable the prefixed Media Source API."> + Disable prefixed Media Source API. </message> - <message name="IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION" desc="Description for the flag to disable the Media Source API on <video> elements."> - Disable experimental Media Source API on the video elements. This API allows JavaScript to send media data directly to a video element. + <message name="IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION" desc="Description for the flag to disable the prefixed Media Source API."> + Disable the experimental WebKitMediaSource object. This object allows JavaScript to send media data directly to a video element. </message> <message name="IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME" desc="Title for the flag to disable the Encrypted Media Extensions on <video> elements."> Disable Encrypted Media Extensions on <ph name="VIDEO_HTML"><video><ex><video></ex></ph> elements. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index a6685b9..47e19ff 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -688,10 +688,10 @@ const Experiment kExperiments[] = { }, { "disable-media-source", - IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, - IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, + IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, + IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kDisableMediaSource) + SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) }, { "disable-encrypted-media", diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 343b426..ba1ecdd 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/chrome_frame/test/policy_settings_unittest.cc @@ -225,7 +225,7 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { AdditionalLaunchParameters().GetProgram().empty()); std::string test_switches("--"); - test_switches += switches::kDisableMediaSource; + test_switches += switches::kDisableWebKitMediaSource; HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; for (int i = 0; i < arraysize(root); ++i) { @@ -234,13 +234,14 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { ResetPolicySettings(); const CommandLine& additional_params = PolicySettings::GetInstance()->AdditionalLaunchParameters(); - EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource)); + EXPECT_TRUE(additional_params.HasSwitch( + switches::kDisableWebKitMediaSource)); base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); CommandLine new_cmd_line(program_path); new_cmd_line.AppendArguments(additional_params, false); EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); - EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource)); + EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableWebKitMediaSource)); DeleteChromeFramePolicyEntries(root[i]); } 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) |