mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
ae630f45b8
* chore: bump chromium in DEPS to 93.0.4562.0
* chore: update patches
* [base] Made Value::Take{Dict,List}() rvalue ref-qualified.
https://chromium-review.googlesource.com/c/chromium/src/+/2988105
* Revert "Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)""
https://chromium-review.googlesource.com/c/chromium/src/+/2995482
This reverts commit 9691d6c265 and 797723ec83
* Pass gfx::Insets to GetHTComponentForFrame
https://chromium-review.googlesource.com/c/chromium/src/+/2984243
* chore: bump chromium in DEPS to 93.0.4563.0
* chore: bump chromium in DEPS to 93.0.4564.0
* chore: bump chromium in DEPS to 93.0.4565.0
* chore: bump chromium in DEPS to 93.0.4566.0
* [Clipboard API] Clipboard Custom Formats implementation Part 2.
https://chromium-review.googlesource.com/c/chromium/src/+/2967649
(cherry picked from commit 607ca0a09b)
* Prevent use of base::NoDestructor for trivially-destructible types
https://chromium-review.googlesource.com/c/chromium/src/+/2998672
(cherry picked from commit 3983afda29)
* fixup! [Clipboard API] Clipboard Custom Formats implementation Part 2.
(cherry picked from commit 3a1dbc649c)
* chore: add missing header
(cherry picked from commit a291f4864e)
* chore: update patches
* ci: do not run clipboard tests on WOA
(cherry picked from commit 0e3aedfbde)
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 f0e1a2dda1dd933bb15d726c5d95de416039649b..1d7df102cdc9e3cf7f8ae5b0858bf0fe1d9301be 100644
|
|
--- a/chrome/renderer/media/chrome_key_systems.cc
|
|
+++ b/chrome/renderer/media/chrome_key_systems.cc
|
|
@@ -16,7 +16,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_properties.h"
|
|
#include "components/cdm/renderer/widevine_key_system_properties.h"
|
|
#include "content/public/renderer/render_thread.h"
|
|
@@ -258,12 +260,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
|
|
|
|
// Returns persistent-license session support.
|
|
EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
|
|
+#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 EmeSessionTypeSupport::NOT_SUPPORTED;
|
|
}
|
|
+#endif
|
|
|
|
if (!supported_by_the_cdm) {
|
|
DVLOG(2) << __func__ << ": Not supported by the CDM.";
|