summaryrefslogtreecommitdiff
path: root/chromium/components/cdm
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 14:08:31 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:46:53 +0000
commit6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch)
treeab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/components/cdm
parente733310db58160074f574c429d48f8308c0afe17 (diff)
downloadqtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/components/cdm')
-rw-r--r--chromium/components/cdm/renderer/widevine_key_system_properties.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.cc b/chromium/components/cdm/renderer/widevine_key_system_properties.cc
index 47b7103b044..276f6238efa 100644
--- a/chromium/components/cdm/renderer/widevine_key_system_properties.cc
+++ b/chromium/components/cdm/renderer/widevine_key_system_properties.cc
@@ -119,17 +119,13 @@ EmeConfigRule WidevineKeySystemProperties::GetRobustnessConfigRule(
}
#if defined(OS_CHROMEOS)
- // TODO(ddorwin): Remove this once we have confirmed it is not necessary.
- // See https://crbug.com/482277
- if (robustness == Robustness::EMPTY)
- return EmeConfigRule::SUPPORTED;
-
// Hardware security requires remote attestation.
if (robustness >= Robustness::HW_SECURE_CRYPTO)
return EmeConfigRule::IDENTIFIER_REQUIRED;
// For video, recommend remote attestation if HW_SECURE_ALL is available,
- // because it enables hardware accelerated decoding.
+ // regardless of the value of |robustness|, because it enables hardware
+ // accelerated decoding.
// TODO(sandersd): Only do this when hardware accelerated decoding is
// available for the requested codecs.
if (media_type == EmeMediaType::VIDEO &&