mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 113.0.5672.24
This commit is contained in:
@ -7,5 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/113.0.5672.0'
|
'chromium_checkout': 'refs/tags/113.0.5672.24',
|
||||||
|
'depot_tools_checkout': '2075f733e8'
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 4607e1bd4a189..45fcc0aef8720 100644
|
index 93d76a4dcead4..29999a775a482 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||||
@ -29,7 +29,7 @@ index 4607e1bd4a189..45fcc0aef8720 100644
|
|||||||
if (is_android) {
|
if (is_android) {
|
||||||
sources += [
|
sources += [
|
||||||
"after_startup_task_utils_android.cc",
|
"after_startup_task_utils_android.cc",
|
||||||
@@ -6071,8 +6077,6 @@ static_library("browser") {
|
@@ -6073,8 +6079,6 @@ static_library("browser") {
|
||||||
sources += [
|
sources += [
|
||||||
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
||||||
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
||||||
|
@ -94,7 +94,7 @@ index 3062f57603321..d8532c9c2eabb 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
|
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
|
||||||
index 0846656e45ba8..1f34295fb0544 100644
|
index a6458f11a69e3..16ee357a2ad8e 100644
|
||||||
--- content/app/content_main_runner_impl.cc
|
--- content/app/content_main_runner_impl.cc
|
||||||
+++ content/app/content_main_runner_impl.cc
|
+++ content/app/content_main_runner_impl.cc
|
||||||
@@ -46,6 +46,7 @@
|
@@ -46,6 +46,7 @@
|
||||||
@ -105,7 +105,7 @@ index 0846656e45ba8..1f34295fb0544 100644
|
|||||||
#include "base/time/time.h"
|
#include "base/time/time.h"
|
||||||
#include "base/trace_event/trace_event.h"
|
#include "base/trace_event/trace_event.h"
|
||||||
#include "build/build_config.h"
|
#include "build/build_config.h"
|
||||||
@@ -1300,6 +1301,12 @@ void ContentMainRunnerImpl::Shutdown() {
|
@@ -1284,6 +1285,12 @@ void ContentMainRunnerImpl::Shutdown() {
|
||||||
is_shutdown_ = true;
|
is_shutdown_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,7 +178,7 @@ index ba7f48e90026c..a509cc4565e9f 100644
|
|||||||
|
|
||||||
void CookieManager::SetForceKeepSessionState() {
|
void CookieManager::SetForceKeepSessionState() {
|
||||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||||
index 7301ba6c8992e..c34a2919fa9d0 100644
|
index 2800a880bbc12..405badac21ea6 100644
|
||||||
--- services/network/network_context.cc
|
--- services/network/network_context.cc
|
||||||
+++ services/network/network_context.cc
|
+++ services/network/network_context.cc
|
||||||
@@ -2297,16 +2297,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
@@ -2297,16 +2297,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||||
@ -206,9 +206,9 @@ index 7301ba6c8992e..c34a2919fa9d0 100644
|
|||||||
|
|
||||||
+ builder.SetCookieStore(std::move(cookie_store));
|
+ builder.SetCookieStore(std::move(cookie_store));
|
||||||
+
|
+
|
||||||
if (base::FeatureList::IsEnabled(features::kPrivateStateTokens)) {
|
if (base::FeatureList::IsEnabled(features::kPrivateStateTokens) ||
|
||||||
|
base::FeatureList::IsEnabled(features::kFledgePst)) {
|
||||||
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
||||||
|
|
||||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||||
index f32ad0616a72f..c6cc5fcacf34b 100644
|
index f32ad0616a72f..c6cc5fcacf34b 100644
|
||||||
--- services/network/public/mojom/network_context.mojom
|
--- services/network/public/mojom/network_context.mojom
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
||||||
index e5185febf2cc3..fc296d35427f0 100644
|
index 34c850bb08242..083d97b3069c0 100644
|
||||||
--- content/browser/storage_partition_impl.cc
|
--- content/browser/storage_partition_impl.cc
|
||||||
+++ content/browser/storage_partition_impl.cc
|
+++ content/browser/storage_partition_impl.cc
|
||||||
@@ -496,10 +496,6 @@ class LoginHandlerDelegate {
|
@@ -496,10 +496,6 @@ class LoginHandlerDelegate {
|
||||||
@ -26,7 +26,7 @@ index e5185febf2cc3..fc296d35427f0 100644
|
|||||||
new LoginHandlerDelegate(
|
new LoginHandlerDelegate(
|
||||||
std::move(auth_challenge_responder), std::move(web_contents_getter),
|
std::move(auth_challenge_responder), std::move(web_contents_getter),
|
||||||
auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
|
auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
|
||||||
@@ -3050,8 +3040,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
@@ -3051,8 +3041,12 @@ void StoragePartitionImpl::GetQuotaSettings(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ index e5185febf2cc3..fc296d35427f0 100644
|
|||||||
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3061,9 +3055,12 @@ void StoragePartitionImpl::InitNetworkContext() {
|
@@ -3062,9 +3056,12 @@ void StoragePartitionImpl::InitNetworkContext() {
|
||||||
cert_verifier::mojom::CertVerifierCreationParamsPtr
|
cert_verifier::mojom::CertVerifierCreationParamsPtr
|
||||||
cert_verifier_creation_params =
|
cert_verifier_creation_params =
|
||||||
cert_verifier::mojom::CertVerifierCreationParams::New();
|
cert_verifier::mojom::CertVerifierCreationParams::New();
|
||||||
|
Reference in New Issue
Block a user