diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 13:16:50 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 13:16:50 +0000 |
| commit | ddb0f262406ef9a22704f38256c8bdb341490c42 (patch) | |
| tree | a30fc0baee82d039bca1c58c168407bf32215519 /content/child | |
| parent | c3e0fa765ef19e40867e068496c770234e339ec7 (diff) | |
| download | chromium_src-ddb0f262406ef9a22704f38256c8bdb341490c42.zip chromium_src-ddb0f262406ef9a22704f38256c8bdb341490c42.tar.gz chromium_src-ddb0f262406ef9a22704f38256c8bdb341490c42.tar.bz2 | |
enable MSE and legacy EME by default on Android
We are planning to launch MSE and clearkey/EME for M30 on android.
This CL will enable MSE and clearkey/EME for android.
Launch bug:
BUG=233420,263679
Review URL: https://chromiumcodereview.appspot.com/20104005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child')
| -rw-r--r-- | content/child/runtime_features.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc index b866c24..069d5ae 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc @@ -17,12 +17,6 @@ using WebKit::WebRuntimeFeatures; namespace content { static void SetRuntimeFeatureDefaultsForPlatform() { -#if defined(OS_ANDROID) && !defined(GOOGLE_TV) - WebRuntimeFeatures::enableWebKitMediaSource(false); - WebRuntimeFeatures::enableLegacyEncryptedMedia(false); - WebRuntimeFeatures::enableEncryptedMedia(false); -#endif - #if defined(OS_ANDROID) bool enable_webaudio = false; #if defined(ARCH_CPU_ARMEL) @@ -66,13 +60,8 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( if (command_line.HasSwitch(switches::kDisableGeolocation)) WebRuntimeFeatures::enableGeolocation(false); -#if defined(OS_ANDROID) && !defined(GOOGLE_TV) - if (command_line.HasSwitch(switches::kEnableWebKitMediaSource)) - WebRuntimeFeatures::enableWebKitMediaSource(true); -#else if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) WebRuntimeFeatures::enableWebKitMediaSource(false); -#endif #if defined(OS_ANDROID) if (command_line.HasSwitch(switches::kDisableWebRTC)) { |