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 124.0.6367.18

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-03-27 19:23:12 -04:00
parent 54a9c26b92
commit e683ed880c
13 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patch/patches/chrome_runtime.patch
View File

@@ -384,7 +384,7 @@ index 2f0fe9d22667c..f50fe7bf75df3 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 66b50cf0fd99b..f2e2cc47a513e 100644
index 011ffe3477b67..7bc473463374c 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -47,6 +47,7 @@
@@ -416,7 +416,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -4375,9 +4383,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4360,9 +4368,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@@ -428,7 +428,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6484,7 +6494,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6469,7 +6479,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@@ -437,7 +437,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6502,6 +6512,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6487,6 +6497,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@@ -446,7 +446,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
}
std::vector<base::FilePath>
@@ -7627,10 +7639,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7612,10 +7624,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -459,7 +459,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7649,7 +7661,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7634,7 +7646,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@@ -469,7 +469,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7789,7 +7802,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7774,7 +7787,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@@ -479,7 +479,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 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 d8f6e1ea5f843..27172c75e4c3a 100644
index 943300d211a0b..714227335ba8b 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -144,6 +144,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -491,7 +491,7 @@ index d8f6e1ea5f843..27172c75e4c3a 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out
// to chrome/ to get values or notify about events, but both of these
// functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -681,7 +683,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -678,7 +680,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@@ -500,7 +500,7 @@ index d8f6e1ea5f843..27172c75e4c3a 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1184,7 +1186,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -1181,7 +1183,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@@ -510,7 +510,7 @@ index d8f6e1ea5f843..27172c75e4c3a 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 5eef5cdedda4c..d0c16b6d70585 100644
index 9686c676b0f0b..527e696bfe16d 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -16,6 +16,7 @@
@@ -532,7 +532,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1679,7 +1684,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1689,7 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@@ -542,7 +542,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644
downgrade::RegisterPrefs(registry);
#endif
@@ -1711,6 +1717,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1721,6 +1727,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last.
RegisterLocalStatePrefsForMigration(registry);
@@ -554,7 +554,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644
}
// Register prefs applicable to all profiles.
@@ -2145,6 +2156,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2155,6 +2166,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) {
RegisterProfilePrefs(registry, locale);