diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
| commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
| tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/components/cdm/renderer | |
| parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
| download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz | |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/cdm/renderer')
3 files changed, 11 insertions, 2 deletions
diff --git a/chromium/components/cdm/renderer/android_key_systems.cc b/chromium/components/cdm/renderer/android_key_systems.cc index 280be2879b3..7450b268daa 100644 --- a/chromium/components/cdm/renderer/android_key_systems.cc +++ b/chromium/components/cdm/renderer/android_key_systems.cc @@ -9,12 +9,14 @@ #include "base/command_line.h" #include "base/logging.h" -#include "components/cdm/renderer/widevine_key_system_properties.h" #include "content/public/renderer/render_thread.h" #include "media/base/eme_constants.h" #include "media/base/media_switches.h" #include "media/media_buildflags.h" +#if BUILDFLAG(ENABLE_WIDEVINE) +#include "components/cdm/renderer/widevine_key_system_properties.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" +#endif // BUILDFLAG(ENABLE_WIDEVINE) using media::EmeConfigRule; using media::EmeFeatureSupport; @@ -22,7 +24,9 @@ using media::EmeInitDataType; using media::EmeSessionTypeSupport; using media::KeySystemProperties; using media::SupportedCodecs; +#if BUILDFLAG(ENABLE_WIDEVINE) using Robustness = cdm::WidevineKeySystemProperties::Robustness; +#endif // BUILDFLAG(ENABLE_WIDEVINE) namespace cdm { @@ -112,6 +116,7 @@ SupportedKeySystemResponse QueryKeySystemSupport( return response; } +#if BUILDFLAG(ENABLE_WIDEVINE) void AddAndroidWidevine( std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) { auto response = QueryKeySystemSupport(kWidevineKeySystem); @@ -155,6 +160,7 @@ void AddAndroidWidevine( DCHECK(hw_secure_codecs == media::EME_CODEC_NONE); } } +#endif // BUILDFLAG(ENABLE_WIDEVINE) void AddAndroidPlatformKeySystems( std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) { diff --git a/chromium/components/cdm/renderer/android_key_systems.h b/chromium/components/cdm/renderer/android_key_systems.h index b92e36750e1..285d4f8fb61 100644 --- a/chromium/components/cdm/renderer/android_key_systems.h +++ b/chromium/components/cdm/renderer/android_key_systems.h @@ -10,12 +10,15 @@ #include "components/cdm/common/cdm_messages_android.h" #include "media/base/key_system_properties.h" +#include "third_party/widevine/cdm/buildflags.h" namespace cdm { +#if BUILDFLAG(ENABLE_WIDEVINE) void AddAndroidWidevine( std::vector<std::unique_ptr<media::KeySystemProperties>>* concrete_key_systems); +#endif // BUILDFLAG(ENABLE_WIDEVINE) // Add platform-supported key systems which are not explicitly handled // by Chrome. diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.cc b/chromium/components/cdm/renderer/widevine_key_system_properties.cc index 89ea042e215..5e2857b7f2e 100644 --- a/chromium/components/cdm/renderer/widevine_key_system_properties.cc +++ b/chromium/components/cdm/renderer/widevine_key_system_properties.cc @@ -70,7 +70,7 @@ std::string WidevineKeySystemProperties::GetKeySystemName() const { bool WidevineKeySystemProperties::IsSupportedInitDataType( EmeInitDataType init_data_type) const { - // Here we assume that support for a container imples support for the + // Here we assume that support for a container implies support for the // associated initialization data type. KeySystems handles validating // |init_data_type| x |container| pairings. if (init_data_type == EmeInitDataType::WEBM) |