Update to Chromium version 115.0.5790.32
This commit is contained in:
parent
ed5af5272d
commit
cf87de98bc
|
@ -7,6 +7,6 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/115.0.5790.24',
|
||||
'chromium_checkout': 'refs/tags/115.0.5790.32',
|
||||
'depot_tools_checkout': 'df2f11113c'
|
||||
}
|
||||
|
|
|
@ -20,10 +20,10 @@ index 38f318f9c0b45..0c8c86efedd07 100644
|
|||
|
||||
// Make an exception to allow most visited tiles to commit in
|
||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||
index ad258abf7e17f..4d94f7144f5ce 100644
|
||||
index 26ac68abf3333..a318d55fa1698 100644
|
||||
--- content/browser/renderer_host/navigation_request.cc
|
||||
+++ content/browser/renderer_host/navigation_request.cc
|
||||
@@ -7446,10 +7446,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
@@ -7479,10 +7479,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
bool use_opaque_origin =
|
||||
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
|
||||
network::mojom::WebSandboxFlags::kOrigin;
|
||||
|
@ -47,7 +47,7 @@ index ad258abf7e17f..4d94f7144f5ce 100644
|
|||
}
|
||||
|
||||
return origin_and_debug_info;
|
||||
@@ -7479,6 +7491,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||
@@ -7512,6 +7524,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||
SandboxFlagsToCommit());
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
|
|||
return false;
|
||||
}
|
||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index 9e536d6f48970..aeb659d55123c 100644
|
||||
index 742bcf66760a6..43aef26f3768a 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
|
||||
|
@ -52,7 +52,7 @@ index 9e536d6f48970..aeb659d55123c 100644
|
|||
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
|
||||
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
|
||||
"views/apps/chrome_app_window_client_views_chromeos.cc",
|
||||
@@ -4499,8 +4507,6 @@ static_library("ui") {
|
||||
@@ -4501,8 +4509,6 @@ static_library("ui") {
|
||||
"views/accessibility/theme_tracking_non_accessible_image_view.h",
|
||||
"views/apps/app_dialog/app_dialog_view.cc",
|
||||
"views/apps/app_dialog/app_dialog_view.h",
|
||||
|
@ -61,7 +61,7 @@ index 9e536d6f48970..aeb659d55123c 100644
|
|||
"views/apps/app_info_dialog/app_info_dialog_container.cc",
|
||||
"views/apps/app_info_dialog/app_info_dialog_container.h",
|
||||
"views/apps/app_info_dialog/app_info_dialog_views.cc",
|
||||
@@ -6082,6 +6088,7 @@ static_library("ui") {
|
||||
@@ -6084,6 +6090,7 @@ static_library("ui") {
|
||||
if (enable_printing) {
|
||||
deps += [
|
||||
"//components/printing/browser",
|
||||
|
|
|
@ -99,7 +99,7 @@ index a3ee1846fcf77..13edaf1203d69 100644
|
|||
return raw_otr_profile;
|
||||
}
|
||||
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
||||
index 80acbb1473fc7..9db21208f8e81 100644
|
||||
index 92dec1c25477c..0723bdb6bc6ad 100644
|
||||
--- chrome/browser/profiles/profile_manager.cc
|
||||
+++ chrome/browser/profiles/profile_manager.cc
|
||||
@@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
|
|
|
@ -235,7 +235,7 @@ index 789d147f0b305..64a33cce013c5 100644
|
|||
+#endif
|
||||
}
|
||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||
index dc9912b1dda9d..de1cb5e4eb93c 100644
|
||||
index fbe839fd4259d..fcca09183776d 100644
|
||||
--- chrome/browser/chrome_content_browser_client.cc
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -41,6 +41,7 @@
|
||||
|
@ -297,7 +297,7 @@ index dc9912b1dda9d..de1cb5e4eb93c 100644
|
|||
}
|
||||
|
||||
std::vector<base::FilePath>
|
||||
@@ -7261,10 +7273,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||
@@ -7274,10 +7286,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
||||
const auto now = base::TimeTicks::Now();
|
||||
const auto timeout = GetKeepaliveTimerTimeout(context);
|
||||
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
||||
|
@ -310,7 +310,7 @@ index dc9912b1dda9d..de1cb5e4eb93c 100644
|
|||
FROM_HERE, keepalive_deadline_ - now,
|
||||
base::BindOnce(
|
||||
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
||||
@@ -7283,7 +7295,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||
@@ -7296,7 +7308,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
||||
--num_keepalive_requests_;
|
||||
if (num_keepalive_requests_ == 0) {
|
||||
DVLOG(1) << "Stopping the keepalive timer";
|
||||
|
@ -320,7 +320,7 @@ index dc9912b1dda9d..de1cb5e4eb93c 100644
|
|||
// This deletes the keep alive handle attached to the timer function and
|
||||
// unblock the shutdown sequence.
|
||||
}
|
||||
@@ -7419,7 +7432,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||
@@ -7432,7 +7445,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
||||
const auto now = base::TimeTicks::Now();
|
||||
const auto then = keepalive_deadline_;
|
||||
if (now < then) {
|
||||
|
@ -330,7 +330,7 @@ index dc9912b1dda9d..de1cb5e4eb93c 100644
|
|||
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
||||
weak_factory_.GetWeakPtr(),
|
||||
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
||||
index 902dcaf5df1ca..d8e698886df54 100644
|
||||
index 24b19245f3704..6ace7bc34a53e 100644
|
||||
--- chrome/browser/chrome_content_browser_client.h
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -135,6 +135,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
||||
|
@ -351,7 +351,7 @@ index 902dcaf5df1ca..d8e698886df54 100644
|
|||
content::BrowserContext* context,
|
||||
bool in_memory,
|
||||
const base::FilePath& relative_partition_path,
|
||||
@@ -1010,7 +1012,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
||||
@@ -1013,7 +1015,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
uint64_t num_keepalive_requests_ = 0;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
|
||||
index e36b1e99fb93d..1b7c458666cea 100644
|
||||
index 540473243029e..fc5ae23c187d3 100644
|
||||
--- content/browser/devtools/devtools_instrumentation.h
|
||||
+++ content/browser/devtools/devtools_instrumentation.h
|
||||
@@ -101,7 +101,7 @@ bool ApplyUserAgentMetadataOverrides(
|
||||
|
|
|
@ -34,7 +34,7 @@ index 4438dea521489..987aa9714bd1c 100644
|
|||
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
|
||||
std::move(loader_factory));
|
||||
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
|
||||
index 1c459729c7c90..173c162c9923b 100644
|
||||
index 139a3b1cbe854..cb26c1afd379a 100644
|
||||
--- content/public/browser/content_browser_client.cc
|
||||
+++ content/public/browser/content_browser_client.cc
|
||||
@@ -990,7 +990,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
|
||||
|
@ -55,7 +55,7 @@ index 1c459729c7c90..173c162c9923b 100644
|
|||
|
||||
std::vector<base::FilePath>
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index 44fbcd7d2dde2..3b7a441c3f596 100644
|
||||
index 42805faf7e6cf..57c4e444ec126 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -37,6 +37,7 @@
|
||||
|
@ -66,7 +66,7 @@ index 44fbcd7d2dde2..3b7a441c3f596 100644
|
|||
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
|
||||
#include "content/public/common/page_visibility_state.h"
|
||||
#include "content/public/common/window_container_type.mojom-forward.h"
|
||||
@@ -1820,7 +1821,7 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1817,7 +1818,7 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
//
|
||||
// If |relative_partition_path| is the empty string, it means this needs to
|
||||
// create the default NetworkContext for the BrowserContext.
|
||||
|
@ -75,7 +75,7 @@ index 44fbcd7d2dde2..3b7a441c3f596 100644
|
|||
BrowserContext* context,
|
||||
bool in_memory,
|
||||
const base::FilePath& relative_partition_path,
|
||||
@@ -2028,6 +2029,19 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -2025,6 +2026,19 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
RenderFrameHost* initiator_document,
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
|
||||
|
||||
|
@ -95,7 +95,7 @@ index 44fbcd7d2dde2..3b7a441c3f596 100644
|
|||
// Creates an OverlayWindow to be used for video or Picture-in-Picture.
|
||||
// This window will house the content shown when in Picture-in-Picture mode.
|
||||
// This will return a new OverlayWindow.
|
||||
@@ -2084,6 +2098,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -2081,6 +2095,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Used as part of the user agent string.
|
||||
virtual std::string GetProduct();
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git ui/accessibility/platform/BUILD.gn ui/accessibility/platform/BUILD.gn
|
||||
index c9777e07fdd31..3858ce8c28cb3 100644
|
||||
index 0e49fbdc2fb3e..d448b6bb32f5d 100644
|
||||
--- ui/accessibility/platform/BUILD.gn
|
||||
+++ ui/accessibility/platform/BUILD.gn
|
||||
@@ -286,6 +286,10 @@ component("platform") {
|
||||
@@ -287,6 +287,10 @@ component("platform") {
|
||||
if (use_gio) {
|
||||
configs += [ "//build/linux:gio_config" ]
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
|
||||
index caf0822f9c14c..a052f4265212c 100644
|
||||
index 84d698ad0a8b3..5e216a505e99e 100644
|
||||
--- base/trace_event/builtin_categories.h
|
||||
+++ base/trace_event/builtin_categories.h
|
||||
@@ -63,6 +63,8 @@
|
||||
@@ -64,6 +64,8 @@
|
||||
X("cc") \
|
||||
X("cc.debug") \
|
||||
X("cdp.perf") \
|
||||
|
|
Loading…
Reference in New Issue