From 81813f3a21f00f901cae2fef9a72c93ae559d886 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 21 Sep 2023 14:11:46 -0400 Subject: [PATCH] Update to Chromium version 118.0.5993.22 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 3 ++- patch/patches/chrome_browser.patch | 6 ++--- patch/patches/chrome_browser_browser.patch | 4 ++-- .../chrome_browser_context_menus.patch | 16 +++++++------- .../chrome_browser_dialogs_widget.patch | 4 ++-- patch/patches/chrome_browser_themes.patch | 2 +- patch/patches/chrome_runtime_views.patch | 22 +++++++++---------- patch/patches/extensions_1947.patch | 2 +- patch/patches/light_mode_3534.patch | 6 ++--- patch/patches/services_network_2622.patch | 6 ++--- 10 files changed, 36 insertions(+), 35 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 1c2f050c1..2041c8992 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/118.0.5993.0' + 'chromium_checkout': 'refs/tags/118.0.5993.22', + 'depot_tools_checkout': 'a45d2d4c90' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index cf4405135..5ae8bbccd 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 1a9bff4a3efb7..883534be3c975 100644 +index 9ab6c039d18f8..623dbcd45b04e 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -10,7 +10,7 @@ index 1a9bff4a3efb7..883534be3c975 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -2001,6 +2002,7 @@ static_library("browser") { +@@ -2002,6 +2003,7 @@ static_library("browser") { "//build/config/chromebox_for_meetings:buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 1a9bff4a3efb7..883534be3c975 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2630,6 +2632,10 @@ static_library("browser") { +@@ -2631,6 +2633,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 0600d2cdf..1c24a7e9d 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644 return false; } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index a521886e9eb44..4ba68bf125c94 100644 +index aaaab0d2783ad..c97e5091c6e9f 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -61,7 +61,7 @@ index a521886e9eb44..4ba68bf125c94 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", -@@ -6279,6 +6285,7 @@ static_library("ui") { +@@ -6281,6 +6287,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index cc955b0d6..bc6f6d299 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 81349bc10ffe9..6fce9815a6c51 100644 +index fb518bf28000c..fc9dbdded280a 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -341,6 +341,13 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -349,6 +349,13 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -16,7 +16,7 @@ index 81349bc10ffe9..6fce9815a6c51 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -590,6 +597,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -598,6 +605,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { if (ContextMenuMatcher::IsExtensionsCustomCommandId(id)) return 1; @@ -27,7 +27,7 @@ index 81349bc10ffe9..6fce9815a6c51 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -814,6 +825,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -822,6 +833,14 @@ RenderViewContextMenu::RenderViewContextMenu( pdf_ocr_submenu_model_ = std::make_unique(this); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) @@ -42,7 +42,7 @@ index 81349bc10ffe9..6fce9815a6c51 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1252,6 +1271,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1284,6 +1303,12 @@ void RenderViewContextMenu::InitMenu() { autofill::PopupHidingReason::kContextMenuOpened); } } @@ -55,7 +55,7 @@ index 81349bc10ffe9..6fce9815a6c51 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3320,6 +3345,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3380,6 +3405,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } @@ -69,7 +69,7 @@ index 81349bc10ffe9..6fce9815a6c51 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h -index 88034ab234827..e11cde8e1663b 100644 +index b74da355c7b6b..3efdaa3b25e28 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -152,6 +152,12 @@ class RenderViewContextMenu @@ -85,7 +85,7 @@ index 88034ab234827..e11cde8e1663b 100644 protected: Profile* GetProfile() const; -@@ -433,6 +439,9 @@ class RenderViewContextMenu +@@ -437,6 +443,9 @@ class RenderViewContextMenu // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_browser_dialogs_widget.patch b/patch/patches/chrome_browser_dialogs_widget.patch index 667321b38..2377de010 100644 --- a/patch/patches/chrome_browser_dialogs_widget.patch +++ b/patch/patches/chrome_browser_dialogs_widget.patch @@ -12,7 +12,7 @@ index b169371e4d42f..509e4bda85b47 100644 // on the screen, we can't actually attach to it. parent_window = nullptr; diff --git components/constrained_window/constrained_window_views.cc components/constrained_window/constrained_window_views.cc -index 819da6b0bff94..b25a48fb2516b 100644 +index 819da6b0bff94..a8e3ecd8527bd 100644 --- components/constrained_window/constrained_window_views.cc +++ components/constrained_window/constrained_window_views.cc @@ -105,15 +105,24 @@ void UpdateModalDialogPosition(views::Widget* widget, @@ -105,7 +105,7 @@ index 647391095306e..bd49316ac758e 100644 OnPositionRequiresUpdate(); diff --git components/web_modal/modal_dialog_host.h components/web_modal/modal_dialog_host.h -index 51ed6bcf6b540..9ae4737e0737e 100644 +index 51ed6bcf6b540..c6e1161140655 100644 --- components/web_modal/modal_dialog_host.h +++ components/web_modal/modal_dialog_host.h @@ -34,6 +34,10 @@ class WEB_MODAL_EXPORT ModalDialogHost { diff --git a/patch/patches/chrome_browser_themes.patch b/patch/patches/chrome_browser_themes.patch index 861758d1f..b59b55e34 100644 --- a/patch/patches/chrome_browser_themes.patch +++ b/patch/patches/chrome_browser_themes.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc -index 3b1af39b69a60..3f3f15c23a74f 100644 +index dbd628982e216..d77a39111e254 100644 --- chrome/browser/themes/theme_service.cc +++ chrome/browser/themes/theme_service.cc @@ -29,6 +29,7 @@ diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 219c07a34..9903442de 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -41,7 +41,7 @@ index db31ee0b50746..2f3aebdcb6101 100644 bool BrowserCommandController::IsWebAppOrCustomTab() const { diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc -index 2f7825a3bdf38..8553f4293c576 100644 +index 4019934ef504e..de1b99b3aa342 100644 --- chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc @@ -590,6 +590,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( @@ -102,7 +102,7 @@ index 2f7825a3bdf38..8553f4293c576 100644 } // namespace //////////////////////////////////////////////////////////////////////////////// -@@ -1370,7 +1421,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { +@@ -1378,7 +1429,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { return false; } @@ -111,7 +111,7 @@ index 2f7825a3bdf38..8553f4293c576 100644 GlobalError* error = GlobalErrorServiceFactory::GetForProfile(browser_->profile()) ->GetGlobalErrorByMenuItemCommandID(command_id); -@@ -1385,6 +1436,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { +@@ -1393,6 +1444,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { } } @@ -142,7 +142,7 @@ index 2f7825a3bdf38..8553f4293c576 100644 bool AppMenuModel::IsCommandIdAlerted(int command_id) const { if ((command_id == IDC_RECENT_TABS_MENU) || (command_id == AppMenuModel::kMinRecentTabsCommandId)) { -@@ -1555,11 +1630,15 @@ void AppMenuModel::Build() { +@@ -1563,11 +1638,15 @@ void AppMenuModel::Build() { kDefaultIconSize)); } @@ -163,7 +163,7 @@ index 2f7825a3bdf38..8553f4293c576 100644 AddItemWithStringId(IDC_PRINT, IDS_PRINT); -@@ -1640,9 +1719,13 @@ void AppMenuModel::Build() { +@@ -1648,9 +1727,13 @@ void AppMenuModel::Build() { kMoreToolsMenuItem); if (!features::IsChromeRefresh2023()) { @@ -180,7 +180,7 @@ index 2f7825a3bdf38..8553f4293c576 100644 } if (!features::IsChromeRefresh2023()) { -@@ -1724,6 +1807,11 @@ void AppMenuModel::Build() { +@@ -1732,6 +1815,11 @@ void AppMenuModel::Build() { SetCommandIcon(this, IDC_EXIT, kExitMenuIcon); } @@ -193,10 +193,10 @@ index 2f7825a3bdf38..8553f4293c576 100644 } diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h -index fe6f250d169a3..606cbd2e248b3 100644 +index deae3ef37b950..407db3e600c5a 100644 --- chrome/browser/ui/toolbar/app_menu_model.h +++ chrome/browser/ui/toolbar/app_menu_model.h -@@ -202,6 +202,7 @@ class AppMenuModel : public ui::SimpleMenuModel, +@@ -203,6 +203,7 @@ class AppMenuModel : public ui::SimpleMenuModel, void ExecuteCommand(int command_id, int event_flags) override; bool IsCommandIdChecked(int command_id) const override; bool IsCommandIdEnabled(int command_id) const override; @@ -204,7 +204,7 @@ index fe6f250d169a3..606cbd2e248b3 100644 bool IsCommandIdAlerted(int command_id) const override; bool GetAcceleratorForCommandId(int command_id, ui::Accelerator* accelerator) const override; -@@ -234,6 +235,8 @@ class AppMenuModel : public ui::SimpleMenuModel, +@@ -235,6 +236,8 @@ class AppMenuModel : public ui::SimpleMenuModel, // took to select the command. void LogMenuMetrics(int command_id); @@ -231,7 +231,7 @@ index 59024587ef6b7..0c30aa71768cf 100644 void FindBarHost::RegisterAccelerators() { diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc -index c3b5d07643806..761cc6306363f 100644 +index bb4b3821bcfda..9734fe4aaffcf 100644 --- chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -114,15 +114,23 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant( @@ -331,7 +331,7 @@ index c3b5d07643806..761cc6306363f 100644 key.app_controller = browser_view_->browser()->app_controller(); -@@ -642,5 +672,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( +@@ -632,5 +662,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( } bool BrowserFrame::IsIncognitoBrowser() const { diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index e695028b1..7296a4632 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -131,7 +131,7 @@ index 3d2108f13ea2f..261b0a42bfb21 100644 ExtensionRegistry::Get(browser_context_)->RemoveObserver(this); diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h -index dda0620251895..2b29bdef52444 100644 +index dda0620251895..4014bd801f727 100644 --- extensions/browser/extension_host.h +++ extensions/browser/extension_host.h @@ -62,6 +62,12 @@ class ExtensionHost : public DeferredStartRenderHost, diff --git a/patch/patches/light_mode_3534.patch b/patch/patches/light_mode_3534.patch index a489dd1b7..694b9986c 100644 --- a/patch/patches/light_mode_3534.patch +++ b/patch/patches/light_mode_3534.patch @@ -79,10 +79,10 @@ index e6078b2a45d88..bf051fb8a02f4 100644 web_instance->SetPreferredContrast(CalculatePreferredContrast()); web_instance->set_prefers_reduced_transparency(PrefersReducedTransparency()); diff --git ui/native_theme/native_theme_win.cc ui/native_theme/native_theme_win.cc -index faa15be0b3e08..a61974c495507 100644 +index 595b718583212..001a8a041090e 100644 --- ui/native_theme/native_theme_win.cc +++ ui/native_theme/native_theme_win.cc -@@ -656,14 +656,17 @@ bool NativeThemeWin::ShouldUseDarkColors() const { +@@ -661,14 +661,17 @@ bool NativeThemeWin::ShouldUseDarkColors() const { // Windows high contrast modes are entirely different themes, // so let them take priority over dark mode. // ...unless --force-dark-mode was specified in which case caveat emptor. @@ -102,7 +102,7 @@ index faa15be0b3e08..a61974c495507 100644 return NativeTheme::CalculatePreferredColorScheme(); // According to the spec, the preferred color scheme for web content is 'dark' -@@ -1652,8 +1655,9 @@ void NativeThemeWin::RegisterColorFilteringRegkeyObserver() { +@@ -1657,8 +1660,9 @@ void NativeThemeWin::RegisterColorFilteringRegkeyObserver() { } void NativeThemeWin::UpdateDarkModeStatus() { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index f63453455..7bb2b2ae9 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -195,10 +195,10 @@ index 6c804ec1092af..605ff3b32b0b8 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index f076c5dc62ca5..5b53652ef63df 100644 +index a107e19d2aa1c..9e37a743a5548 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2444,16 +2444,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2446,16 +2446,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } @@ -227,7 +227,7 @@ index f076c5dc62ca5..5b53652ef63df 100644 base::FeatureList::IsEnabled(features::kFledgePst)) { trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 039407080ba9b..aa960e5943129 100644 +index 6164ab364a404..44ab11a34eb44 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -377,6 +377,9 @@ struct NetworkContextParams {