e012801420
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
|
|
index c0cf00b5da05..992827ca6782 100644
|
|
--- a/chrome/renderer/media/chrome_key_systems.cc
|
|
+++ b/chrome/renderer/media/chrome_key_systems.cc
|
|
@@ -14,7 +14,9 @@
|
|
#include "base/strings/string_split.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "build/build_config.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"
|
|
@@ -142,12 +144,14 @@ static void AddExternalClearKey(
|
|
#if defined(WIDEVINE_CDM_AVAILABLE)
|
|
// 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.";
|