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 115.0.5790.0 (#1148114)

Browse Source 
- Mac: 13.3 SDK (Xcode 14.3) is now required
This commit is contained in:
Marshall Greenblatt
2023-05-30 11:55:32 +03:00
parent cf8b7db4b4
commit 695ee2a041
83 changed files with 604 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
patch/patches/chrome_runtime.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index fb5093709a104..2a69318c3e5e2 100644
index 0141f1f97e0b4..d7e1c98b68c4f 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -39,6 +39,7 @@
@@ -40,6 +40,7 @@
#include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -10,7 +10,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#include "chrome/browser/buildflags.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
@@ -502,6 +503,8 @@ struct MainFunction {
@@ -503,6 +504,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) {
@ -19,7 +19,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_WIN)
// Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs.
@@ -651,6 +654,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
@@ -652,6 +655,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
ChromeMainDelegate::~ChromeMainDelegate() = default;
#endif // !BUILDFLAG(IS_ANDROID)
@ -30,7 +30,7 @@ index fb5093709a104..2a69318c3e5e2 100644
absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
InvokedIn invoked_in) {
DCHECK(base::ThreadPoolInstance::Get());
@@ -867,7 +874,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
@@ -868,7 +875,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
if (base::FeatureList::IsEnabled(
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
@ -40,7 +40,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_ANDROID)
record =
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
@@ -1294,6 +1302,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1296,6 +1304,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@ -48,7 +48,7 @@ index fb5093709a104..2a69318c3e5e2 100644
crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_POSIX)
@@ -1304,6 +1313,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1306,6 +1315,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@ -56,7 +56,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1498,6 +1508,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1500,6 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -64,7 +64,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1541,6 +1552,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1543,6 +1554,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -72,7 +72,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1664,6 +1676,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1666,6 +1678,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@ -80,7 +80,7 @@ index fb5093709a104..2a69318c3e5e2 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner.
const base::CommandLine* command_line =
@@ -1686,6 +1699,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1688,6 +1701,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -88,7 +88,7 @@ index fb5093709a104..2a69318c3e5e2 100644
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -1783,6 +1797,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -1785,6 +1799,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
channel == version_info::Channel::DEV);
const bool gwp_asan_boost_sampling = is_canary_dev || is_browser_process;
@ -96,7 +96,7 @@ index fb5093709a104..2a69318c3e5e2 100644
memory_system::Initializer()
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
.SetProfilingClientParameters(channel,
@@ -1791,5 +1806,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -1793,5 +1808,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
PoissonAllocationSamplerInclusion::kEnforce,
memory_system::DispatcherParameters::
AllocationTraceRecorderInclusion::kDynamic)
@ -126,7 +126,7 @@ index dad9f981d2e01..29baaf84465a0 100644
#if BUILDFLAG(IS_CHROMEOS_LACROS)
std::unique_ptr<chromeos::LacrosService> lacros_service_;
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index b759be27d35ab..75d3c03b748a2 100644
index 91fe738fb59f1..10e7748c43a8f 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@ -137,7 +137,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1499,7 +1500,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1518,7 +1519,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -146,7 +146,7 @@ index b759be27d35ab..75d3c03b748a2 100644
// Handle special early return paths (which couldn't be processed even earlier
// as they require the process singleton to be held) first.
@@ -1546,7 +1547,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1565,7 +1566,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
return content::RESULT_CODE_NORMAL_EXIT;
#endif // BUILDFLAG(IS_WIN)
}
@ -155,7 +155,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#if BUILDFLAG(IS_WIN)
// Check if there is any machine level Chrome installed on the current
@@ -1601,12 +1602,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1620,12 +1621,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->local_state());
}
@ -170,7 +170,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#if BUILDFLAG(IS_ANDROID)
page_info::SetPageInfoClient(new ChromePageInfoClient());
@@ -1755,6 +1758,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1771,6 +1774,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -181,7 +181,7 @@ index b759be27d35ab..75d3c03b748a2 100644
// This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|.
@@ -1793,11 +1800,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1809,11 +1816,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@ -197,7 +197,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#endif // !BUILDFLAG(IS_ANDROID)
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
index d495e1a903fd8..31cf6632e831c 100644
index 789d147f0b305..64a33cce013c5 100644
--- chrome/browser/chrome_browser_main_mac.mm
+++ chrome/browser/chrome_browser_main_mac.mm
@@ -17,6 +17,7 @@
@ -235,10 +235,10 @@ index d495e1a903fd8..31cf6632e831c 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index cbaaff6894e47..db95ce1bc3a0d 100644
index 1b9db89f8dce3..980999042366a 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -40,6 +40,7 @@
@@ -41,6 +41,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -246,7 +246,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1557,6 +1558,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
@@ -1538,6 +1539,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
}
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -255,7 +255,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(
std::make_unique<ChromeContentBrowserClientPluginsPart>());
@@ -1589,6 +1592,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1570,6 +1573,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
}
}
@ -267,7 +267,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -4386,9 +4394,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4306,9 +4314,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -279,7 +279,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6307,7 +6317,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6229,7 +6239,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@ -288,7 +288,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6325,6 +6335,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6247,6 +6257,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -297,7 +297,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
}
std::vector<base::FilePath>
@@ -7314,10 +7326,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7260,10 +7272,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 cbaaff6894e47..db95ce1bc3a0d 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7336,7 +7348,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7282,7 +7294,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -320,7 +320,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7472,7 +7485,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7418,7 +7431,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -330,10 +330,10 @@ index cbaaff6894e47..db95ce1bc3a0d 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 30ee8cf906f70..09e4fa568c05a 100644
index 902dcaf5df1ca..d8e698886df54 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -134,6 +134,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -135,6 +135,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
~ChromeContentBrowserClient() override;
@ -342,7 +342,7 @@ index 30ee8cf906f70..09e4fa568c05a 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.
@@ -618,7 +620,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -617,7 +619,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -351,7 +351,7 @@ index 30ee8cf906f70..09e4fa568c05a 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -998,7 +1000,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -1010,7 +1012,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@ -361,7 +361,7 @@ index 30ee8cf906f70..09e4fa568c05a 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index d11c0f1334924..47f8edcf62b3a 100644
index ffc921ad54a3e..590abcaf1b49d 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -13,6 +13,7 @@
@ -383,7 +383,7 @@ index d11c0f1334924..47f8edcf62b3a 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1369,6 +1374,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1439,6 +1444,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last.
RegisterLocalStatePrefsForMigration(registry);
@ -395,7 +395,7 @@ index d11c0f1334924..47f8edcf62b3a 100644
}
// Register prefs applicable to all profiles.
@@ -1766,6 +1776,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1839,6 +1849,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) {
RegisterProfilePrefs(registry, locale);