You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
chromium/chromium-52.0.2743.82-widev...

26 lines
1.5 KiB

diff -up chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix chromium-52.0.2743.82/chrome/common/chrome_content_client.cc
--- chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix 2016-07-22 12:18:49.505235856 -0400
+++ chromium-52.0.2743.82/chrome/common/chrome_content_client.cc 2016-07-22 12:20:04.200789682 -0400
@@ -203,10 +203,7 @@ void ComputeBuiltInPlugins(std::vector<c
widevine_cdm.is_out_of_process = true;
widevine_cdm.path = adapter_path;
widevine_cdm.name = kWidevineCdmDisplayName;
- widevine_cdm.description =
- base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
- kWidevineCdmDescription);
- widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
+ widevine_cdm.description = kWidevineCdmDescription;
content::WebPluginMimeType widevine_cdm_mime_type(
kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
kWidevineCdmPluginMimeTypeDescription);
@@ -555,8 +552,7 @@ void ChromeContentClient::AddContentDecr
// CdmInfo needs |path| to be the actual Widevine library,
// not the adapter, so adjust as necessary. It will be in the
// same directory as the installed adapter.
- const base::Version version(WIDEVINE_CDM_VERSION_STRING);
- DCHECK(version.IsValid());
+ const base::Version version;
cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
codecs_supported));
}