From 5e0d8ce439b1d87a25397742dd2a8a76c6691b45 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 9 Aug 2023 16:37:24 +0000 Subject: [PATCH] Update to Chromium version 116.0.5845.62 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../browser_security_policy_1081397.patch | 10 +++---- .../browser_web_ui_controller_factory.patch | 4 +-- patch/patches/chrome_runtime.patch | 26 +++++++++---------- patch/patches/views_1749_2102_3330.patch | 4 +-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 9d25dab2a..abde703da 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/116.0.5845.50', + 'chromium_checkout': 'refs/tags/116.0.5845.62', 'depot_tools_checkout': '6d0c235dae' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 1793d182a..05df6e61f 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 2bfca65cd8d13..0a5b7a68fca46 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 76a53ed5fcae9..8b21a96635537 100644 +index a09b5bc4973fc..3593dd66d977f 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -7292,10 +7292,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -7301,10 +7301,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,9 +47,9 @@ index 76a53ed5fcae9..8b21a96635537 100644 } return origin_and_debug_info; -@@ -7325,6 +7337,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { - GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( - SandboxFlagsToCommit()); +@@ -7408,6 +7420,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { + DetermineInitiatorRelationship(initiator_rfh, + frame_tree_node_->current_frame_host())); + if (origin_with_debug_info.first.opaque() && + origin_with_debug_info.second.find("cef_nonstandard") != diff --git a/patch/patches/browser_web_ui_controller_factory.patch b/patch/patches/browser_web_ui_controller_factory.patch index 7a5ca0603..652d0d027 100644 --- a/patch/patches/browser_web_ui_controller_factory.patch +++ b/patch/patches/browser_web_ui_controller_factory.patch @@ -13,10 +13,10 @@ index 9d9c17ffd6474..4eb79c65369af 100644 }; diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h -index 19777632921fc..a22db4c49fd84 100644 +index a80034506bf45..4bda477df0558 100644 --- content/public/browser/webui_config_map.h +++ content/public/browser/webui_config_map.h -@@ -60,6 +60,10 @@ class CONTENT_EXPORT WebUIConfigMap { +@@ -61,6 +61,10 @@ class CONTENT_EXPORT WebUIConfigMap { // Returns the size of the map, i.e. how many WebUIConfigs are registered. size_t GetSizeForTesting() { return configs_map_.size(); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 11fabe39b..86ed8df1f 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -1,5 +1,5 @@ diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc -index 3a1539905f1fb..84071f39325a2 100644 +index d55fc46d9dc0a..0f4dd2b3e68f9 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -40,6 +40,7 @@ @@ -10,7 +10,7 @@ index 3a1539905f1fb..84071f39325a2 100644 #include "chrome/browser/buildflags.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" -@@ -504,6 +505,8 @@ struct MainFunction { +@@ -505,6 +506,8 @@ struct MainFunction { // Initializes the user data dir. Must be called before InitializeLocalState(). void InitializeUserDataDir(base::CommandLine* command_line) { @@ -19,7 +19,7 @@ index 3a1539905f1fb..84071f39325a2 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. -@@ -653,6 +656,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { +@@ -654,6 +657,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { ChromeMainDelegate::~ChromeMainDelegate() = default; #endif // !BUILDFLAG(IS_ANDROID) @@ -30,7 +30,7 @@ index 3a1539905f1fb..84071f39325a2 100644 absl::optional ChromeMainDelegate::PostEarlyInitialization( InvokedIn invoked_in) { DCHECK(base::ThreadPoolInstance::Get()); -@@ -876,7 +883,8 @@ absl::optional ChromeMainDelegate::PostEarlyInitialization( +@@ -877,7 +884,8 @@ absl::optional ChromeMainDelegate::PostEarlyInitialization( if (base::FeatureList::IsEnabled( features::kWriteBasicSystemProfileToPersistentHistogramsFile)) { @@ -40,7 +40,7 @@ index 3a1539905f1fb..84071f39325a2 100644 #if BUILDFLAG(IS_ANDROID) record = base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions); -@@ -1304,6 +1312,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1306,6 +1314,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -48,7 +48,7 @@ index 3a1539905f1fb..84071f39325a2 100644 crash_reporter::InitializeCrashKeys(); #if BUILDFLAG(IS_POSIX) -@@ -1314,6 +1323,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1316,6 +1325,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif @@ -56,7 +56,7 @@ index 3a1539905f1fb..84071f39325a2 100644 #if BUILDFLAG(IS_WIN) child_process_logging::Init(); -@@ -1508,6 +1518,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1510,6 +1520,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -64,7 +64,7 @@ index 3a1539905f1fb..84071f39325a2 100644 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { -@@ -1551,6 +1562,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1553,6 +1564,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 3a1539905f1fb..84071f39325a2 100644 #if BUILDFLAG(ENABLE_PDF) MaybePatchGdiGetFontData(); -@@ -1670,6 +1682,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1672,6 +1684,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } @@ -80,7 +80,7 @@ index 3a1539905f1fb..84071f39325a2 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 = -@@ -1692,6 +1705,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1694,6 +1707,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); @@ -88,7 +88,7 @@ index 3a1539905f1fb..84071f39325a2 100644 } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1789,6 +1803,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -1791,6 +1805,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 3a1539905f1fb..84071f39325a2 100644 memory_system::Initializer() .SetGwpAsanParameters(gwp_asan_boost_sampling, process_type) .SetProfilingClientParameters(channel, -@@ -1797,5 +1812,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -1799,5 +1814,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { PoissonAllocationSamplerInclusion::kEnforce, memory_system::DispatcherParameters:: AllocationTraceRecorderInclusion::kDynamic) @@ -233,7 +233,7 @@ index ad3976cb46454..b49f7467156ed 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 506b22b8fb061..b327360b4700c 100644 +index c9d9ffa8d77a3..43e1701c73f2b 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -41,6 +41,7 @@ diff --git a/patch/patches/views_1749_2102_3330.patch b/patch/patches/views_1749_2102_3330.patch index d125384b2..9e9a39a22 100644 --- a/patch/patches/views_1749_2102_3330.patch +++ b/patch/patches/views_1749_2102_3330.patch @@ -396,7 +396,7 @@ index c048ab2aa5ae4..810f62eed6676 100644 explicit MenuHost(SubmenuView* submenu); diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc -index f99daa29d9181..49b4a3da021ea 100644 +index 4eb86394166d0..1533acb185438 100644 --- ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc @@ -1096,6 +1096,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -415,7 +415,7 @@ index f99daa29d9181..49b4a3da021ea 100644 } else if (paint_as_selected) { gfx::Rect item_bounds = GetLocalBounds(); if (type_ == Type::kActionableSubMenu) { -@@ -1160,6 +1169,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) { +@@ -1159,6 +1168,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) { } SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {