mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 134.0.6998.35
This commit is contained in:
committed by
Marshall Greenblatt
parent
3463fdd061
commit
2cb5ebb3db
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/134.0.6998.23'
|
'chromium_checkout': 'refs/tags/134.0.6998.35'
|
||||||
}
|
}
|
||||||
|
@@ -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 9f293f4ddd146..e9b20e7c5f39d 100644
|
index ab4deb1a228f5..c98b27c19a611 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")
|
||||||
@@ -10,7 +10,7 @@ index 9f293f4ddd146..e9b20e7c5f39d 100644
|
|||||||
import("//chrome/browser/buildflags.gni")
|
import("//chrome/browser/buildflags.gni")
|
||||||
import("//chrome/browser/downgrade/buildflags.gni")
|
import("//chrome/browser/downgrade/buildflags.gni")
|
||||||
import("//chrome/browser/request_header_integrity/buildflags.gni")
|
import("//chrome/browser/request_header_integrity/buildflags.gni")
|
||||||
@@ -1838,6 +1839,7 @@ static_library("browser") {
|
@@ -1844,6 +1845,7 @@ static_library("browser") {
|
||||||
"//build/config/compiler:compiler_buildflags",
|
"//build/config/compiler:compiler_buildflags",
|
||||||
"//build/config/linux/dbus:buildflags",
|
"//build/config/linux/dbus:buildflags",
|
||||||
"//cc",
|
"//cc",
|
||||||
@@ -18,7 +18,7 @@ index 9f293f4ddd146..e9b20e7c5f39d 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -2524,6 +2526,10 @@ static_library("browser") {
|
@@ -2530,6 +2532,10 @@ static_library("browser") {
|
||||||
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
|
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
||||||
index 8a8a0bdade6fe..59b9b4a7fe9da 100644
|
index 1d0f19760a671..c21a9a23ff281 100644
|
||||||
--- content/browser/devtools/devtools_http_handler.cc
|
--- content/browser/devtools/devtools_http_handler.cc
|
||||||
+++ content/browser/devtools/devtools_http_handler.cc
|
+++ content/browser/devtools/devtools_http_handler.cc
|
||||||
@@ -591,7 +591,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
@@ -591,7 +591,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
||||||
|
@@ -12,7 +12,7 @@ index 3f65718281973..66580417cc79e 100644
|
|||||||
# https://crbug.com/474506.
|
# https://crbug.com/474506.
|
||||||
"//clank/java/BUILD.gn",
|
"//clank/java/BUILD.gn",
|
||||||
diff --git BUILD.gn BUILD.gn
|
diff --git BUILD.gn BUILD.gn
|
||||||
index a05810690041d..cac7f91fc271d 100644
|
index 704ddc0e043d8..b762c1887cd3b 100644
|
||||||
--- BUILD.gn
|
--- BUILD.gn
|
||||||
+++ BUILD.gn
|
+++ BUILD.gn
|
||||||
@@ -19,6 +19,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
@@ -19,6 +19,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git components/metrics/persistent_system_profile.cc components/metrics/persistent_system_profile.cc
|
diff --git components/metrics/persistent_system_profile.cc components/metrics/persistent_system_profile.cc
|
||||||
index 3cef1f28ccdb0..c91c9927436de 100644
|
index 5ffc5ec97f90a..d322d2a26264a 100644
|
||||||
--- components/metrics/persistent_system_profile.cc
|
--- components/metrics/persistent_system_profile.cc
|
||||||
+++ components/metrics/persistent_system_profile.cc
|
+++ components/metrics/persistent_system_profile.cc
|
||||||
@@ -401,6 +401,10 @@ bool PersistentSystemProfile::GetSystemProfile(
|
@@ -415,6 +415,10 @@ bool PersistentSystemProfile::GetSystemProfile(
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
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 5b7298888a896..4d1d7d412179f 100644
|
index 29a3522bffdd0..f5edd823612a4 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
|
||||||
@@ -3402,9 +3402,12 @@ void StoragePartitionImpl::InitNetworkContext() {
|
@@ -3449,9 +3449,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