[patch] chromium-widevine-version.patch

chromium-widevine-version.patch (text/plain), 4.35 KB, created by Ari Entlich on 2015-07-29 03:46:50 UTC

diff -ru chromium-old/chrome/common/chrome_content_client.cc chromium-new/chrome/common/chrome_content_client.cc
--- chromium-old/chrome/common/chrome_content_client.cc	2015-07-15 16:29:59.000000000 -0400
+++ chromium-new/chrome/common/chrome_content_client.cc	2015-07-27 21:47:52.796829940 -0400
@@ -111,6 +111,30 @@
 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_nacl_shutdown_module;
 #endif
 
+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
+    !defined(WIDEVINE_CDM_IS_COMPONENT)
+const size_t kMaxWidevineCdmVersionFileLength = 32;
+
+std::string ComputeWidevineVersionString() {
+  base::FilePath path;
+
+  if (PathService::Get(chrome::FILE_WIDEVINE_CDM_VERSION, &path)) {
+    std::string version;
+
+    ReadFileToString(path, &version, kMaxWidevineCdmVersionFileLength);
+    if (!version.empty()) {
+      size_t newline = version.find_first_of("\r\n");
+      if (newline != std::string::npos)
+        version.erase(newline);
+
+      return version;
+    }
+  }
+
+  return "<unknown version>";
+}
+#endif
+
 // Appends the known built-in plugins to the given vector. Some built-in
 // plugins are "internal" which means they are compiled into the Chrome binary,
 // and some are extra shared libraries distributed with the browser (these are
@@ -169,14 +193,15 @@
   static bool skip_widevine_cdm_file_check = false;
   if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
     if (skip_widevine_cdm_file_check || base::PathExists(path)) {
+      std::string widevine_cdm_version_string = ComputeWidevineVersionString();
       content::PepperPluginInfo widevine_cdm;
       widevine_cdm.is_out_of_process = true;
       widevine_cdm.path = path;
       widevine_cdm.name = kWidevineCdmDisplayName;
       widevine_cdm.description = kWidevineCdmDescription +
                                  std::string(" (version: ") +
-                                 WIDEVINE_CDM_VERSION_STRING + ")";
-      widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
+                                 widevine_cdm_version_string + ")";
+      widevine_cdm.version = widevine_cdm_version_string;
       content::WebPluginMimeType widevine_cdm_mime_type(
           kWidevineCdmPluginMimeType,
           kWidevineCdmPluginExtension,
diff -ru chromium-old/chrome/common/chrome_paths.cc chromium-new/chrome/common/chrome_paths.cc
--- chromium-old/chrome/common/chrome_paths.cc	2015-07-26 19:02:08.797416232 -0400
+++ chromium-new/chrome/common/chrome_paths.cc	2015-07-26 19:03:04.197413978 -0400
@@ -367,6 +367,11 @@
         return false;
       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
       break;
+    case chrome::FILE_WIDEVINE_CDM_VERSION:
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      cur = cur.AppendASCII(kWidevineCdmVersionFileName);
+      break;
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX) && !defined(OS_IOS)
diff -ru chromium-old/chrome/common/chrome_paths.h chromium-new/chrome/common/chrome_paths.h
--- chromium-old/chrome/common/chrome_paths.h	2015-07-26 19:02:03.654083108 -0400
+++ chromium-new/chrome/common/chrome_paths.h	2015-07-26 19:02:35.667415139 -0400
@@ -96,6 +96,7 @@
   DIR_COMPONENT_WIDEVINE_CDM,   // Directory that contains component-updated
                                 // Widevine CDM files.
   FILE_WIDEVINE_CDM_ADAPTER,    // Full path to the Widevine CDM adapter file.
+  FILE_WIDEVINE_CDM_VERSION,    // Full path to the Widevine CDM version file.
   FILE_RESOURCES_PACK,          // Full path to the .pak file containing
                                 // binary data (e.g., html files and images
                                 // used by internal pages).
diff -ru chromium-old/third_party/widevine/cdm/widevine_cdm_common.h chromium-new/third_party/widevine/cdm/widevine_cdm_common.h
--- chromium-old/third_party/widevine/cdm/widevine_cdm_common.h	2015-07-15 16:30:08.000000000 -0400
+++ chromium-new/third_party/widevine/cdm/widevine_cdm_common.h	2015-07-27 21:57:21.183473482 -0400
@@ -46,6 +46,8 @@
     "libwidevinecdmadapter.so";
 #endif
 
+const char kWidevineCdmVersionFileName[] = "widevine.version";
+
 // The following strings are used to communicate supported codecs (from the
 // component manifest) via WebPluginInfo::WebPluginMimeType's additional params.
 const char kCdmSupportedCodecsParamName[] = "codecs";