bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patch/patches/services_network_2718.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index de63186ea911e..4beccce527c86 100644
index 95e5475cc69e8..2c07037751538 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -498,10 +498,6 @@ class LoginHandlerDelegate {
@@ -474,10 +474,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index de63186ea911e..4beccce527c86 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -552,12 +548,6 @@ void OnAuthRequiredContinuation(
@@ -528,12 +524,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index de63186ea911e..4beccce527c86 100644
new LoginHandlerDelegate(
std::move(auth_challenge_responder), std::move(web_contents_getter),
auth_info, is_request_for_main_frame, process_id, request_id, url,
@@ -2689,8 +2679,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2671,8 +2661,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@ -40,12 +40,15 @@ index de63186ea911e..4beccce527c86 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -2703,6 +2697,11 @@ void StoragePartitionImpl::InitNetworkContext() {
GetContentClient()->browser()->ConfigureNetworkContextParams(
@@ -2682,9 +2676,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New();
- GetContentClient()->browser()->ConfigureNetworkContextParams(
+ if (!GetContentClient()->browser()->ConfigureNetworkContextParams(
browser_context_, is_in_memory(), relative_partition_path_,
context_params.get(), cert_verifier_creation_params.get());
+ if (context_params->context_name &&
+ *context_params->context_name == "magic_shutting_down") {
- context_params.get(), cert_verifier_creation_params.get());
+ context_params.get(), cert_verifier_creation_params.get())) {
+ // Don't re-initialize the network context during shutdown.
+ return;
+ }