diff options
| author | ddorwin <ddorwin@chromium.org> | 2015-04-01 20:35:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 03:35:30 +0000 |
| commit | 53625eed98105bfa900672cefa6336280272e9f7 (patch) | |
| tree | 5c9e048636200d27736f197ddf52d5f6062c27ee /android_webview/lib | |
| parent | 8110808664066715bd1eea9160d4b240c7b78dc8 (diff) | |
| download | chromium_src-53625eed98105bfa900672cefa6336280272e9f7.zip chromium_src-53625eed98105bfa900672cefa6336280272e9f7.tar.gz chromium_src-53625eed98105bfa900672cefa6336280272e9f7.tar.bz2 | |
Replace kMediaDrmEnableNonCompositing swicth with use_video_overlay_for_embedded_encrypted_video pref
Disables kMediaDrmEnableNonCompositing by default in WebView.
It is now controlled by the pref.
Also updates comments related to enabling unprefixed EME.
BUG=470275,470279
Review URL: https://codereview.chromium.org/1045173002
Cr-Commit-Position: refs/heads/master@{#323420}
Diffstat (limited to 'android_webview/lib')
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 1377618..27e5da9 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -77,11 +77,8 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { // Web Notification API and the Push API are not supported (crbug.com/434712) cl->AppendSwitch(switches::kDisableNotifications); -#if defined(VIDEO_HOLE) - // Support EME with hole-punching. For example, Widevine L1. - cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); + // TODO(ddorwin): Enable unprefixed EME. See http://crbug.com/394931. cl->AppendSwitch(switches::kDisableEncryptedMedia); -#endif // WebRTC hardware decoding is not supported, internal bug 15075307 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding); |