update to 49.0

1 files changed, 49 insertions, 8 deletions

diff --git a/chromium-widevine.patch b/chromium-widevine.patch
index 45048cada875..569ad4c88bfe 100644
--- a/chromium-widevine.patch
+++ b/chromium-widevine.patch
@@ -1,12 +1,53 @@
-diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h
---- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h	2015-04-15 01:18:59.000000000 +0300
-+++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h	2015-04-15 09:09:49.157260050 +0300
-@@ -14,4 +14,8 @@
- //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- //    as a string, e.g., "1.0.123.456").
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc	2016-01-20 22:01:20.000000000 +0200
++++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc	2016-01-21 20:02:02.788936626 +0200
+@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
+ #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
+     !defined(WIDEVINE_CDM_IS_COMPONENT)
+   static bool skip_widevine_cdm_file_check = false;
+-  if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
++  bool widevine_cdm_present =
++      skip_widevine_cdm_file_check ||
++      (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
++       base::PathExists(path));
++  if (widevine_cdm_present &&
++      PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+     if (skip_widevine_cdm_file_check || base::PathExists(path)) {
+       content::PepperPluginInfo widevine_cdm;
+       widevine_cdm.is_out_of_process = true;
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc	2016-01-20 22:01:20.000000000 +0200
++++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc	2016-01-21 19:18:51.287978456 +0200
+@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;
++    case chrome::FILE_WIDEVINE_CDM:
++      if (!GetInternalPluginsDirectory(&cur))
++        return false;
++      cur = cur.AppendASCII(kWidevineCdmFileName);
++      break;
+ #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
+     case chrome::FILE_RESOURCES_PACK:
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h	2016-01-14 03:49:22.000000000 +0200
++++ chromium-48.0.2564.82/chrome/common/chrome_paths.h	2016-01-21 19:18:51.287978456 +0200
+@@ -99,6 +99,7 @@ enum {
+   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,            // Full path to the Widevine CDM file.
+   FILE_RESOURCES_PACK,          // Full path to the .pak file containing
+                                 // binary data (e.g., html files and images
+                                 // used by internal pages).
+diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
+--- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-14 01:05:17.000000000 +0200
++++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-21 19:18:51.287978456 +0200
+@@ -12,4 +12,6 @@
+ 
+ #define WIDEVINE_CDM_AVAILABLE
  
-+#include "third_party/widevine/cdm/widevine_cdm_common.h"
-+#define WIDEVINE_CDM_AVAILABLE
 +#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
 +
  #endif  // WIDEVINE_CDM_VERSION_H_