mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 04:30:46 +01:00
2f1e782f62
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
|
index a1db5b377647e..3442371165570 100644
|
|
--- content/browser/storage_partition_impl.cc
|
|
+++ content/browser/storage_partition_impl.cc
|
|
@@ -3345,8 +3345,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
|
return;
|
|
}
|
|
|
|
+ // CEF always returns false for IsOffTheRecord(), so also check the path.
|
|
+ const bool is_incognito = browser_context_->IsOffTheRecord() ||
|
|
+ browser_context_->GetPath().empty();
|
|
+
|
|
storage::GetNominalDynamicSettings(
|
|
- GetPath(), browser_context_->IsOffTheRecord(),
|
|
+ GetPath(), is_incognito,
|
|
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
|
}
|
|
|
|
@@ -3356,9 +3360,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());
|
|
+ context_params.get(), cert_verifier_creation_params.get())) {
|
|
+ // Don't re-initialize the network context during shutdown.
|
|
+ return;
|
|
+ }
|
|
// Should be initialized with existing per-profile CORS access lists.
|
|
DCHECK(context_params->cors_origin_access_list.empty())
|
|
<< "NetworkContextParams::cors_origin_access_list should be populated "
|