mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
29ced1215a
* chore: bump chromium in DEPS to 111.0.5563.19 * chore: bump chromium in DEPS to 111.0.5563.33 * chore: bump chromium in DEPS to 111.0.5563.41 * chore: update patches * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 (cherry picked from commit52740f127f) * chore: remove dead DecodeToken code (cherry picked from commite7ac425771) * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 (cherry picked from commit911e353b07) * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 (cherry picked from commita8b3befdd7) * chore: bump chromium in DEPS to 111.0.5563.50 * chore: update patches * 4240360: [intl] Revert date formatting behavior change from ICU 72 https://chromium-review.googlesource.com/c/v8/v8/+/4240360 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:50:13 -0700
|
|
Subject: chrome_key_systems.patch
|
|
|
|
Disable persiste licence support check for widevine cdm,
|
|
as its not supported in the current version of chrome.
|
|
|
|
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
|
|
index 771183255372710a95630a62057cf467ee63b1b2..b640d2218241291c970810ae1df9e994c4416d78 100644
|
|
--- a/chrome/renderer/media/chrome_key_systems.cc
|
|
+++ b/chrome/renderer/media/chrome_key_systems.cc
|
|
@@ -17,7 +17,9 @@
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "build/build_config.h"
|
|
#include "build/chromeos_buildflags.h"
|
|
+#if 0
|
|
#include "chrome/renderer/chrome_render_thread_observer.h"
|
|
+#endif
|
|
#include "components/cdm/renderer/external_clear_key_key_system_info.h"
|
|
#include "components/cdm/renderer/widevine_key_system_info.h"
|
|
#include "content/public/renderer/render_thread.h"
|
|
@@ -239,12 +241,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability,
|
|
|
|
// Returns whether persistent-license session can be supported.
|
|
bool CanSupportPersistentLicense() {
|
|
+#if 0
|
|
// Do not support persistent-license if the process cannot persist data.
|
|
// TODO(crbug.com/457487): Have a better plan on this. See bug for details.
|
|
if (ChromeRenderThreadObserver::is_incognito_process()) {
|
|
DVLOG(2) << __func__ << ": Not supported in incognito process.";
|
|
return false;
|
|
}
|
|
+#endif
|
|
|
|
// On ChromeOS, platform verification is similar to CDM host verification.
|
|
#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) || BUILDFLAG(IS_CHROMEOS)
|