diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/third_party/widevine | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
| download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/widevine')
| -rw-r--r-- | chromium/third_party/widevine/cdm/BUILD.gn | 10 | ||||
| -rw-r--r-- | chromium/third_party/widevine/cdm/widevine_cdm_common.h | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn index a3eac59cc2e..f35d8187209 100644 --- a/chromium/third_party/widevine/cdm/BUILD.gn +++ b/chromium/third_party/widevine/cdm/BUILD.gn @@ -110,15 +110,7 @@ if (widevine_cdm_binary_files != []) { "//build/config:exe_and_shlib_deps", ] - if (is_mac) { - ldflags = [ - # Not to strip important symbols by -Wl,-dead_strip. - "-Wl,-exported_symbol,_PPP_GetInterface", - "-Wl,-exported_symbol,_PPP_InitializeModule", - "-Wl,-exported_symbol,_PPP_ShutdownModule", - ] - #TODO(jrummell) Mac: 'DYLIB_INSTALL_NAME_BASE': '@loader_path', - } else if (is_posix && !is_mac) { + if (is_posix && !is_mac) { cflags = [ "-fvisibility=hidden" ] } } diff --git a/chromium/third_party/widevine/cdm/widevine_cdm_common.h b/chromium/third_party/widevine/cdm/widevine_cdm_common.h index 49ace0422a9..b09aa1d5786 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm_common.h +++ b/chromium/third_party/widevine/cdm/widevine_cdm_common.h @@ -17,7 +17,9 @@ const char kWidevineKeySystem[] = "com.widevine.alpha"; const char kWidevineCdmGuid[] = "AD87877A-0213-49A8-8849-9E93B075E477"; -// Widevine CDM files are in a directory with this name. +// Widevine CDM files are in a directory with this name. This path is also +// hardcoded in some build files and changing it requires changing the build +// files as well. const char kWidevineCdmBaseDirectory[] = "WidevineCdm"; // This name is used by UMA. Do not change it! @@ -56,6 +58,7 @@ const char kWidevineCdmAdapterFileName[] = // The following strings are used to communicate supported codecs (from the // component manifest) via WebPluginInfo::WebPluginMimeType's additional params. +// TODO(crbug.com/772160): Remove after pepper CDM is deprecated. const char kCdmSupportedCodecsParamName[] = "codecs"; const char kCdmSupportedCodecsValueDelimiter = ','; const char kCdmSupportedCodecVp8[] = "vp8"; @@ -63,6 +66,10 @@ const char kCdmSupportedCodecVp9[] = "vp9.0"; #if BUILDFLAG(USE_PROPRIETARY_CODECS) const char kCdmSupportedCodecAvc1[] = "avc1"; #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) +const char kCdmPersistentLicenseSupportedParamName[] = + "persistent_license_supported"; +const char kCdmFeatureSupported[] = "true"; +const char kCdmFeatureNotSupported[] = "false"; #if defined(OS_MACOSX) || defined(OS_WIN) // CDM is installed by the component installer instead of the Chrome installer. |