summaryrefslogtreecommitdiffstats
path: root/android_webview/renderer
diff options
context:
space:
mode:
authorsandersd <sandersd@chromium.org>2015-05-05 18:50:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-06 01:52:17 +0000
commita6bf8b52a70dafe95e8e2d8827f5e1283ec1bf56 (patch)
tree24fd280efc30617bbdb4802a082dce2ea3a99d8e /android_webview/renderer
parentd5538fccee51a36e074196b5f5b846a787559600 (diff)
downloadchromium_src-a6bf8b52a70dafe95e8e2d8827f5e1283ec1bf56.zip
chromium_src-a6bf8b52a70dafe95e8e2d8827f5e1283ec1bf56.tar.gz
chromium_src-a6bf8b52a70dafe95e8e2d8827f5e1283ec1bf56.tar.bz2
Support Android secure codecs in requestMediaKeySystemAccess().
This adds the bits necessary to determine if a configuration requires hardware-secure codecs. It does not add the logic to actually enable secure surfaces based on the requirement, that decision is still based on the renderer preference. BUG=467779 Review URL: https://codereview.chromium.org/1106263004 Cr-Commit-Position: refs/heads/master@{#328464}
Diffstat (limited to 'android_webview/renderer')
-rw-r--r--android_webview/renderer/aw_key_systems.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc
index 29e50ce..cc3059e 100644
--- a/android_webview/renderer/aw_key_systems.cc
+++ b/android_webview/renderer/aw_key_systems.cc
@@ -9,11 +9,7 @@ namespace android_webview {
void AwAddKeySystems(
std::vector<media::KeySystemInfo>* key_systems_info) {
- // TODO(sandersd): Non-compositing support depends on the
- // use_video_overlay_for_embedded_encrypted_video pref, which may differ per
- // WebContents. For now, err on the side of registering support.
- // http://crbug.com/467779
- cdm::AddAndroidWidevine(key_systems_info, true);
+ cdm::AddAndroidWidevine(key_systems_info);
cdm::AddAndroidPlatformKeySystems(key_systems_info);
}