From ebcd9074dc1bd2e5eb94fcc3f21751483fcd0a79 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 8 Apr 2022 14:53:49 +0100 Subject: [PATCH] Updated patches from Chromium 102.0.4987.0 to Chromium 102.0.4991.0. --- patches/base-BUILD.gn.patch | 4 +- patches/build-config-android-config.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 6 +-- patches/build-config-compiler-BUILD.gn.patch | 4 +- patches/chrome-BUILD.gn.patch | 10 ++--- patches/chrome-android-BUILD.gn.patch | 2 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 +-- patches/chrome-app-chrome_dll.rc.patch | 6 +-- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...ser-global_keyboard_shortcuts_mac.mm.patch | 14 +++--- ...hrome-browser-prefs-browser_prefs.cc.patch | 4 +- ...profiles-profile_avatar_icon_util.cc.patch | 8 ++-- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 6 +-- ...ettings-people_page-sync_controls.ts.patch | 2 +- ...ettings-privacy_page-privacy_page.ts.patch | 2 +- ...ngs-settings_page-main_page_mixin.ts.patch | 2 +- ...settings-category_default_setting.ts.patch | 6 +-- ..._settings_page-site_settings_page.ts.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...-extension_action_view_controller.cc.patch | 2 +- ...s-extension_action_view_controller.h.patch | 8 ++-- ...ions-icon_with_badge_image_source.cc.patch | 6 +-- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...cation_bar-icon_label_bubble_view.cc.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...owser-ui-webui-history-history_ui.cc.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 2 +- ...aller-linux-common-installer.include.patch | 4 +- ...hrome-installer-mac-signing-parts.py.patch | 6 +-- ...taller-mini_installer-chrome.release.patch | 4 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 2 +- ...history-core-browser-history_types.h.patch | 2 +- ...ch_engines-default_search_manager.cc.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 +-- ...-renderer_host-navigation_request.cc.patch | 2 +- ...ntent-renderer-render_thread_impl.cc.patch | 2 +- ...nsions-common-api-_api_features.json.patch | 4 +- ...hrome-browser-prefs-browser_prefs.mm.patch | 6 +-- patches/net-BUILD.gn.patch | 4 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...anvas2d-base_rendering_context_2d.cc.patch | 4 +- ...modules-webaudio-analyser_handler.cc.patch | 4 +- ...bgl-webgl2_rendering_context_base.cc.patch | 8 ++-- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...tools-gritsettings-resource_ids.spec.patch | 6 +-- ...metadata-histogram_suffixes_list.xml.patch | 4 +- 56 files changed, 141 insertions(+), 141 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 281d4a4420c..624938d91ec 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index c49d23d14226c0c2ed2407bd09045c736bd3db75..b1a76f3358f3b962ae1df68f737c69db02c545ff 100644 +index 15da9351b899b669e4d5f4c9fd58a3dc692b2452..9756061cafbae74fb0a1b2a6e0800d55bf140230 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4127,6 +4127,7 @@ if (is_android) { +@@ -4128,6 +4128,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index ebec3de98a8..37011826218 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 473214562b50bb9319771acd21deeea6f90829b3..98d58421424f8db0a581a90ff231de6f896cbbd9 100644 +index 56e2c642190f02d3f64949ed5e1e2a48a0ab56d9..8515d39c371713966b111e8d58f3055015a24c53 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -8,6 +8,7 @@ diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 457d7aca78c..286615d5999 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 70ec1dc26fcc6e1c18da3ef55ce7ebf5a16d9165..142448b8f6ee0ad1da440808c39751d10c73a22c 100644 +index 0ca23f5814e62ff89425515ace593963afd2f65d..d84c92137f0813ff765e47e0b957b9921852b87a 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -485,6 +485,7 @@ if (enable_java_templates) { +@@ -500,6 +500,7 @@ if (enable_java_templates) { # ] # } template("java_cpp_enum") { @@ -10,7 +10,7 @@ index 70ec1dc26fcc6e1c18da3ef55ce7ebf5a16d9165..142448b8f6ee0ad1da440808c39751d1 action_with_pydeps(target_name) { forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ]) -@@ -656,6 +657,7 @@ if (enable_java_templates) { +@@ -671,6 +672,7 @@ if (enable_java_templates) { # output = "$target_gen_dir/AndroidManifest.xml" # } template("jinja_template") { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index e2b175b4bb7..b15aace9318 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index f00e99b0cdca6e2bd1e79c22d752d6f3e47be0b5..9d708de95e9ac65ac8106b42a62311508c23622b 100644 +index 1bcf5a4fe902e11474b5eb1cf30cc8217f4b6f6a..e2ed11c9165256c7c1fda7becbac6865498c73b9 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1675,6 +1675,7 @@ config("chromium_code") { +@@ -1671,6 +1671,7 @@ config("chromium_code") { ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 01a822b0cd1..1c5903e9b04 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 6b8f8778d17008582ab9edeae6d63dd1111182f3..4b8f0f861a387492d582305743dc5332d80bcd37 100644 +index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68a5c0410c 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -170,6 +170,7 @@ if (!is_android && !is_mac) { @@ -69,7 +69,7 @@ index 6b8f8778d17008582ab9edeae6d63dd1111182f3..4b8f0f861a387492d582305743dc5332 } extra_substitutions = [ -@@ -1197,6 +1204,7 @@ if (is_win) { +@@ -1192,6 +1199,7 @@ if (is_win) { chrome_dylib_version, "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir), ] @@ -77,7 +77,7 @@ index 6b8f8778d17008582ab9edeae6d63dd1111182f3..4b8f0f861a387492d582305743dc5332 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1383,6 +1391,7 @@ if (is_win) { +@@ -1370,6 +1378,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index 6b8f8778d17008582ab9edeae6d63dd1111182f3..4b8f0f861a387492d582305743dc5332 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1453,7 +1462,7 @@ group("dependencies") { +@@ -1440,7 +1449,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -94,7 +94,7 @@ index 6b8f8778d17008582ab9edeae6d63dd1111182f3..4b8f0f861a387492d582305743dc5332 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1507,6 +1516,7 @@ group("resources") { +@@ -1494,6 +1503,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index ddad8c216af..b3da40d082b 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 6a072c35a6cdfabff1704bb297e443f09080961d..703237a9617bf56effcadbacf011e1248d279041 100644 +index fee0d7f20ef9b5ba48ab2d64d53a482894bcfd88..d046e7855bb301f0d753f5422dfae526306198a4 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -270,6 +270,7 @@ android_resources("chrome_app_java_resources") { diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 6291bff72d5..4962856a900 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 53b51fbfda3ffa2540dfb651161a669971d2bccc..b6d6a874482ea2729e0d37d7fc006e8f1d91fb83 100644 +index dd82006872953b53387cba19cc9026b6e546968e..44a57b7d6c9ad6de92d1ab22e8fd02f826d9ad5b 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -172,6 +172,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -173,6 +173,7 @@ template("chrome_public_common_apk_or_module_tmpl") { "*ic_file_download_white*", # Bottom edge seems misaligned. "*ic_lock.*", # Bottom edge seems misaligned. ] @@ -10,7 +10,7 @@ index 53b51fbfda3ffa2540dfb651161a669971d2bccc..b6d6a874482ea2729e0d37d7fc006e8f # Note most of these, with the exception of resource_exclusion_exceptions, # are currently duplicated in system_webview_apk_tmpl.gni. -@@ -268,6 +269,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -269,6 +270,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-app-chrome_dll.rc.patch b/patches/chrome-app-chrome_dll.rc.patch index a718785c7b9..de8ca41acfa 100644 --- a/patches/chrome-app-chrome_dll.rc.patch +++ b/patches/chrome-app-chrome_dll.rc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc -index d299571ac031f4b3ff964fbf2dd865ba31bdd0bf..06eef7187c1c288d1db668b94ed742d538c6b2bf 100644 +index dd09d73abfe19411d45451792cc8418b6667ca94..822c4cf9afa8ff458e2ac37be0140c335d21e5bd 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc -@@ -164,6 +164,15 @@ END +@@ -166,6 +166,15 @@ END // the icon from the current module). We can perhaps work around this in the // future to get the icon from the .exe, which would save a copy. @@ -18,7 +18,7 @@ index d299571ac031f4b3ff964fbf2dd865ba31bdd0bf..06eef7187c1c288d1db668b94ed742d5 #if BUILDFLAG(GOOGLE_CHROME_BRANDING) IDR_MAINFRAME ICON "theme\google_chrome\win\chrome.ico" IDR_SXS ICON "theme\google_chrome\win\chrome_sxs.ico" -@@ -172,6 +181,7 @@ IDR_X005_BETA ICON "theme\google_chrome\win\chrome_ +@@ -174,6 +183,7 @@ IDR_X005_BETA ICON "theme\google_chrome\win\chrome_ #else IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico" #endif diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 78a07f5c3ae..b03dacc7b5a 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 39c2f3f41ea24bc989a2fd9f341966721f34b300..4bfb96e5952cc5e81686f139ed0ac6ac22d78171 100644 +index caf4aae54234a2a72ec3d0d87cd4ed780b88923d..5170a55118372684a5a8cd25394e4c4a4ccaa25a 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2590,6 +2590,7 @@ static_library("browser") { +@@ -2596,6 +2596,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 308e1cc9ccd..3a5b6be7b9f 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index acfe572390ed19c0cddd7c8176239414036a3e7b..c602de660e527da2717fdd7b4b8b86b0b4207810 100644 +index 3f7af788055cad58fa6e9a706b2393ab202dd990..84d648063dedc04cf2ed44e762fdafa9d2a2aefa 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2968,6 +2968,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = { +@@ -3011,6 +3011,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch index 0c4937eb2e7..cdeca4c95b8 100644 --- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch +++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm -index 4bd6e3af39cc3f369b8a2fce61fa96591998de91..fdf368bc58bce2586eaccb6e698f5a293db37f63 100644 +index b4c85b92468ec43747b72fdeaf2bf4068534bd47..0253843194f8e443e46a37a61d428dead35afdbd 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm -@@ -173,6 +173,7 @@ CommandForKeyEventResult ShortcutCommand(int cmd) { - {true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE}, - {true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE}, - {true, true, false, true, kVK_ANSI_A, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY}, +@@ -180,6 +180,7 @@ CommandForKeyEventResult ShortcutCommand(int cmd) { + {true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE}, + {true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE}, + {true, true, false, true, kVK_ANSI_A, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY}, + {true, false, false, true, kVK_ANSI_N, IDC_NEW_OFFTHERECORD_WINDOW_TOR}, - }); - // clang-format on + }); + // clang-format on diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index c3dc0270db4..3842ddb333b 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index be0f0ed3911f966b52c502561aaf7f5d41001079..f978ad82a0cfd777adad9c0da54070019fc4a7d4 100644 +index be739641724161f396fe65fa6a99e8c3b0234cb9..b628fa7cf725f99fa7f70a0da0a086866b3476bf 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -1199,6 +1199,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { @@ -10,7 +10,7 @@ index be0f0ed3911f966b52c502561aaf7f5d41001079..f978ad82a0cfd777adad9c0da5407001 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) screen_ai::RegisterLocalStatePrefs(registry); -@@ -1528,6 +1529,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1529,6 +1530,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterBooleanPref(prefs::kPrivacyGuideViewed, false); RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index 8303a18a31d..d249a566df7 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 84e9eb4616d93ea36c00c49b8622bf31fd4d98cf..828d050a3d003a96307e3e68887a3d50620e76ac 100644 +index d315b900ff513f4c39aa71c51856c3e0fff05dd3..0bcb85d1eb8273b919c0aa31d526720c40198d2a 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -348,7 +348,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -350,7 +350,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif BUILDFLAG(IS_CHROMEOS_ASH) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index 84e9eb4616d93ea36c00c49b8622bf31fd4d98cf..828d050a3d003a96307e3e68887a3d50 #endif #if !BUILDFLAG(IS_ANDROID) -@@ -460,6 +460,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -462,6 +462,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) @@ -19,7 +19,7 @@ index 84e9eb4616d93ea36c00c49b8622bf31fd4d98cf..828d050a3d003a96307e3e68887a3d50 return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -493,6 +494,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -495,6 +496,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index d05d96cc1a2..840969ec4a8 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index e2d76eb46cd17522bfcc508d68c8fb20693527b3..7c231b0f0f0402071f39a6b19748c2c78783b48e 100644 +index a3d0830cebbcac6c9e4f151f8d40ab50bd800d8c..19ad7bee4270707587eb0b5bf0dd97c0df2d3f8b 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -364,7 +364,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -363,7 +363,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, NOTREACHED(); } diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index b907ecd6270..d12ee0fab40 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 231b5d6a923d5a16e78fa4da21aba62d4fd5d57a..673ab16714b02a2ba0acd391beed8200b2c83a7d 100644 +index 1687c8f965a49dda9cc5f8a37ad2271cfa8ac506..7825c197082b553846d9b96b540970165078c1a1 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1786,6 +1786,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1843,6 +1843,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 9132aaa3623..1b6cbd91289 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index c068761b5c0d0431cac5d456347ff4541cfa942a..224ceb9807bbdacb1f7a41cacd3e42268e3e3cc9 100644 +index 16edbd2b396d2125c1f51e61962d5c905dc0b472..f2fd64debd2895b8417249ef5a6ba08f7261736a 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -149,6 +149,7 @@ class RenderViewContextMenu diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 3412cb87d56..0d7fa9f11e0 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 5d9a91903dcbb8fb122fc5a2b20757adbc4204d5..8f4afab77b59537b2ea8ca9d6a840c601f1ea287 100644 +index d2a8621134f456b8b0c07b41639b35d8ce07d6ae..576f381bbfaa575ecb4fa49649062c95ff91012d 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -120,6 +120,7 @@ generate_grd("build_grd") { +@@ -122,6 +122,7 @@ generate_grd("build_grd") { deps = [ ":build_ts" ] manifest_files = [ "$target_gen_dir/tsconfig.manifest" ] } @@ -10,7 +10,7 @@ index 5d9a91903dcbb8fb122fc5a2b20757adbc4204d5..8f4afab77b59537b2ea8ca9d6a840c60 } preprocess_if_expr("preprocess") { -@@ -278,4 +279,6 @@ ts_library("build_ts") { +@@ -280,4 +281,6 @@ ts_library("build_ts") { ":preprocess", ":preprocess_generated", ] diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch index a6f38b48d07..146e7cc6906 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts -index 0921dde59e3b879662997bcee5c277e8c8c15bc4..c07d2e71f45bd8dd15f5d0f0507bdc7293598cbc 100644 +index 177e113489644c19d0c6678c4a26263674a967db..944e4ef751c759309f15bcd8c9ea46d109c92593 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts @@ -100,7 +100,7 @@ export class SettingsSyncControlsElement extends diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index 537fbdfe561..f2869966244 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index 3da04c0a84e63a520ed693a9f533ad324f5964da..961507f0f4eb1ef9206f4e6b229ff122e880a4af 100644 +index a849f644e2c7241067b2a774ad950e3ac4a19a91..a669dd94e03cc54401e66a55f07a525581648c97 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -20,6 +20,7 @@ import '../site_settings/site_data_details_subpage.js'; diff --git a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch index 1666f4090e9..1ded5e32685 100644 --- a/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch +++ b/patches/chrome-browser-resources-settings-settings_page-main_page_mixin.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts -index 199fb27b1f77d9133359d9f0d3f2591a9be94082..801880938091a2c42516af24155d1a8fbba35098 100644 +index edd2054d9099c7b6cb371951f61281f149023891..1390e4dae935ab9654a8625b4cbdf09830199a7f 100644 --- a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts +++ b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts @@ -38,7 +38,7 @@ guestTopLevelRoute = routes.PRIVACY; diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch index cd6c704f9d8..99b5c023b89 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts -index 100faef074a8aef57a34bfc9e8d0b23eab89a514..6b4fc1826b25ff3950d504d4704129a046cbd240 100644 +index fd67aa7bcaa50b72c1a79d9e091155ee0d745aae..96a5d387fc2b13f36ecfc9fbaae73c0cc69207c4 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts -@@ -183,6 +183,7 @@ export class CategoryDefaultSettingElement extends +@@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends */ switch (this.category) { case ContentSettingsTypes.ADS: @@ -10,7 +10,7 @@ index 100faef074a8aef57a34bfc9e8d0b23eab89a514..6b4fc1826b25ff3950d504d4704129a0 case ContentSettingsTypes.BACKGROUND_SYNC: case ContentSettingsTypes.IMAGES: case ContentSettingsTypes.JAVASCRIPT: -@@ -216,6 +217,7 @@ export class CategoryDefaultSettingElement extends +@@ -217,6 +218,7 @@ export class CategoryDefaultSettingElement extends case ContentSettingsTypes.USB_DEVICES: case ContentSettingsTypes.VR: case ContentSettingsTypes.WINDOW_PLACEMENT: diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index 1dfd68868bd..bc7dc3b5584 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index 3a5cd1d77729547bf0835aeab7358edcfe39a906..b159b5afe42e9c5f4b8023438a323eebbe411dd4 100644 +index 44cb7a530f706734b0ef306ee6599a3849507334..959c3ea8d86b6374957635b5d20a278890f59085 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index a10e644d401..e526bb3302d 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 77b3bcffd732188cccdf2d830f9bd3af4c1b3835..7007a4c44866c8cfb5ff4effd98970ae4a4f5157 100644 +index 5e82dc49d37a292ea7e6f7f2f72f18bcdc028caf..dc9c49931c6a268d5b836c1df80989de1d65f7f6 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -650,6 +650,7 @@ static_library("ui") { +@@ -652,6 +652,7 @@ static_library("ui") { "//ui/webui", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 77b3bcffd732188cccdf2d830f9bd3af4c1b3835..7007a4c44866c8cfb5ff4effd98970ae # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3820,10 +3821,13 @@ static_library("ui") { +@@ -3830,10 +3831,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch index 2b18f4f7cad..5b9da316e04 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc -index 3493b718cb952fb363ba2496ed6924d993f132cd..30cd6db2c6efe70c0ef68b114f442f420241e091 100644 +index 30dc2734a16aef9fe08493f82a1c18b27fe813f6..a0c8b03787192cdfc0bf9830c238a6939712fc35 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc @@ -63,7 +63,6 @@ ExtensionActionViewController::Create( diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch index 58de61e898d..156442fa84d 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h -index 487d6599a658a326dbcb6583b80f6b47534cd478..c80e72fc6b8432f41000de361e42c642f42de358 100644 +index 7248884f6368fb0f9e15e2fdbb6b013799b6839a..44104470e81ad3402ce22721c18a451f8c706bce 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h @@ -18,6 +18,7 @@ @@ -18,7 +18,7 @@ index 487d6599a658a326dbcb6583b80f6b47534cd478..c80e72fc6b8432f41000de361e42c642 static std::unique_ptr Create( const extensions::ExtensionId& extension_id, Browser* browser, -@@ -137,6 +139,7 @@ class ExtensionActionViewController +@@ -139,6 +141,7 @@ class ExtensionActionViewController // In some cases (such as when an action is shown in a menu), a substitute // ToolbarActionViewController should be used for showing popups. This // returns the preferred controller. @@ -26,7 +26,7 @@ index 487d6599a658a326dbcb6583b80f6b47534cd478..c80e72fc6b8432f41000de361e42c642 ExtensionActionViewController* GetPreferredPopupViewController(); // Begins the process of showing the popup for the extension action on the -@@ -144,6 +147,7 @@ class ExtensionActionViewController +@@ -146,6 +149,7 @@ class ExtensionActionViewController // user action. // The popup may not be shown synchronously if the extension is hidden and // first needs to slide itself out. @@ -34,7 +34,7 @@ index 487d6599a658a326dbcb6583b80f6b47534cd478..c80e72fc6b8432f41000de361e42c642 void TriggerPopup(PopupShowAction show_action, bool by_user, ShowPopupCallback callback); -@@ -155,6 +159,7 @@ class ExtensionActionViewController +@@ -157,6 +161,7 @@ class ExtensionActionViewController ShowPopupCallback callback); // Handles cleanup after the popup closes. diff --git a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch index 5adedf36dea..f721326166e 100644 --- a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch +++ b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -index cdd4882eb906ac6ee8fb5dd590a1da3c70445c4a..3238041d6a32e893a5671412452e65c85ad9f7f7 100644 +index d8d85ecf46eb833fc04efb3b079cdf16765e3e07..e60586e5edf7cbeeaf425ad383e5a55fdead2655 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -@@ -155,6 +155,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { +@@ -156,6 +156,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale()); if (rep.scale() != canvas->image_scale()) { skia.AddRepresentation( @@ -10,7 +10,7 @@ index cdd4882eb906ac6ee8fb5dd590a1da3c70445c4a..3238041d6a32e893a5671412452e65c8 ScaleImageSkiaRep(rep, extensions::ExtensionAction::ActionIconSize(), canvas->image_scale())); } -@@ -165,6 +166,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { +@@ -166,6 +167,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { (size().width() - extensions::ExtensionAction::ActionIconSize()) / 2.0); int y_offset = std::floor( (size().height() - extensions::ExtensionAction::ActionIconSize()) / 2.0); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 5cfedfc332b..6172e88ceef 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 0ace4d8d7aa7fd7f2618789b670d1a3e1746b6a2..1143eaf6efb4cdc0bb6eba503b43fb01b9cedd93 100644 +index 0f9c928cb62078029f7b69ba64f203a877211807..9e6984c68e2d5ce3fc4d69d9fb1cc0034478b95e 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -611,4 +611,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -624,4 +624,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 5a78528d1ad..2c60761e4a2 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 12f958ec78e4fef1e1e5bc510bb99618bd7af5ec..41e03bb6dec4ab2b5da19cb84041347580c05038 100644 +index 6106b41de476623d0093d53e25b0442fff8ab764..fc2e136048969ff1fe0a2df1f66e858ee3623e67 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -671,6 +671,7 @@ class TabStripModel : public TabGroupController { +@@ -672,6 +672,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch index 52142c2bdbc..bb305553b31 100644 --- a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -index 9073fb2d0916ff47dcbf4cf36a142ab395cd9425..33bc473781baecefdade929c250bb5cd8e24d5a0 100644 +index 729b57da77e796a17a824e9862759bbbeb7f171c..42d490352b680ae9b4977c754c69bee7bb587c7f 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -@@ -572,6 +572,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { +@@ -573,6 +573,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { const float corner_radius = highlight_bounds.height() / 2.f; const SkRect rect = RectToSkRect(highlight_bounds); diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index a3702300e8f..c536c1d7854 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index bbec78cfd639ef806f412454a4434bc817fb181d..a9697a2fb8d7cbfd5e931c351a4234af29f62415 100644 +index a338dc5e6f728b91ea6c277b44b966ce4db26fb7..09c7ac455753718efe862b358a6dfb8f3ea76c17 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -667,6 +667,7 @@ void LocationBarView::Layout() { +@@ -666,6 +666,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 60a499dd857..b4bfba3544f 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index e098eb1932aafa558dc82a190eea526af1be1ac5..662727fbab2e86bc31fd3c324ef059ee26c8f5a2 100644 +index e6fc31050ac30266e51dc09522a37a958a6e4a3f..b0d662f5fc986bd3b5f6718142adf2801778afbc 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1412,6 +1412,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1415,6 +1415,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index d6641aba50e..9a587ea162c 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 8adcea81330107f2dae91d5535c8dc1aab9b47c0..2ab9dbf00d4853bb2211140eec6a852cdde00026 100644 +index c5f76d91691ba7dd7c2250ea161bc9fe09965da2..be59c6471c0732d52b92185ca7e2121293adca4f 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -366,6 +366,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, +@@ -367,6 +367,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile, kEnableEnhancedSiteControls, base::FeatureList::IsEnabled(features::kExtensionsMenuAccessControl)); diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 34e7da4eb13..b9eb602115d 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index 823c438945be433b622cf6749a28a587df3cfe7a..2b3ade242759dbd5bb5a8083a7073648c15c1686 100644 +index fc63468ec4a9d16a1a536dba8f88813ea07cf2fa..bb5e6418b3e6f633ccbce17736880cbb67a7cb29 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -69,6 +69,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index 9adbe5c0f40..fef1f359c62 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index 0466a1ed02cb16b686707a2cc18c3d0421796873..1669b454066418dfbbc975624158fa6df05faee5 100644 +index bcd5c878f887a620f9c8c161d478f95718d310d9..ce6541ea461458e15bb9646950a949a03b8fdd45 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -841,6 +841,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index 9c68f102096..e1ccc63989f 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 6b6fa7011e4599c37bb9f9086e95f535e4b819f8..6ab9d31cc89bae988cd5a247d77ad87f7ba9a342 100644 +index 9f0f85bea5dbcd301e91625a8bddb163242fb1cd..0ed060cd1d4fb3725baf590774a1c5deaaddc817 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -19,7 +19,7 @@ index 6b6fa7011e4599c37bb9f9086e95f535e4b819f8..6ab9d31cc89bae988cd5a247d77ad87f # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -311,11 +314,13 @@ stage_install_common() { +@@ -302,11 +305,13 @@ stage_install_common() { # app icons local icon_regex=".*product_logo_[0-9]\+\." diff --git a/patches/chrome-installer-mac-signing-parts.py.patch b/patches/chrome-installer-mac-signing-parts.py.patch index 05df3c3d901..2e83b8310c4 100644 --- a/patches/chrome-installer-mac-signing-parts.py.patch +++ b/patches/chrome-installer-mac-signing-parts.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/signing/parts.py b/chrome/installer/mac/signing/parts.py -index d4247ed4fe0004ccce8552d15e3a6c33e1cc136c..db0900c1321d7cfe8a53469783004355d57f0f89 100644 +index c4037ccb5f82f6ba355c6e9ebea4f7ea8575d439..32b941645d6fc6023ee5888522c752d7a93caed0 100644 --- a/chrome/installer/mac/signing/parts.py +++ b/chrome/installer/mac/signing/parts.py @@ -10,6 +10,7 @@ import os.path @@ -10,7 +10,7 @@ index d4247ed4fe0004ccce8552d15e3a6c33e1cc136c..db0900c1321d7cfe8a53469783004355 _PROVISIONPROFILE_EXT = '.provisionprofile' _PROVISIONPROFILE_DEST = 'embedded.provisionprofile' -@@ -134,6 +135,7 @@ def get_parts(config): +@@ -132,6 +133,7 @@ def get_parts(config): library_basename.replace('.dylib', ''), verify_options=verify_options) @@ -18,7 +18,7 @@ index d4247ed4fe0004ccce8552d15e3a6c33e1cc136c..db0900c1321d7cfe8a53469783004355 return parts -@@ -197,6 +199,7 @@ def sign_chrome(paths, config, sign_framework=False): +@@ -195,6 +197,7 @@ def sign_chrome(paths, config, sign_framework=False): continue signing.sign_part(paths, config, part) diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch index 140bef6d5a8..8cbaeffb9eb 100644 --- a/patches/chrome-installer-mini_installer-chrome.release.patch +++ b/patches/chrome-installer-mini_installer-chrome.release.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release -index 9c6346bb8c88fdab90ea9f2c60bd2a5f54ad14a3..575a29aaa44fdeaaa1a2a564528efc4990fff927 100644 +index 5cdaad05767053cf4327e7edf8c47adf473c31f2..4f3bfdc2eb7da65d778adb92225a05c9ec97be87 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -6,7 +6,7 @@ @@ -26,7 +26,7 @@ index 9c6346bb8c88fdab90ea9f2c60bd2a5f54ad14a3..575a29aaa44fdeaaa1a2a564528efc49 chrome_elf.dll: %(VersionDir)s\ chrome_pwa_launcher.exe: %(VersionDir)s\ d3dcompiler_47.dll: %(VersionDir)s\ -@@ -68,6 +73,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ +@@ -62,6 +67,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 142aa27d0b4..f023e20df4c 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 6ad9cb2b1876956ab9ee826ccc15e3f3ca03d733..800d1075bb8ae54a815e0f41b1a0300b42f56ad8 100644 +index 4dc47fb91328aeae6ce283983690129cf30b1146..55f7444499dab2c30fc1cdfb242e1ccc09604ab5 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -205,6 +205,7 @@ static_library("renderer") { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index fd679a6a614..2b5213e8504 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 0664182904fb067b6ac2cbbb029a283b6a6c5f6d..0fe85c815bb4312c40d3b8f27d1696466d73ce3a 100644 +index 0ce66d2791c256209aee6a73f4739c56d3f2478e..53a470afe1c699e59fe2110e7542be0fb845b8c5 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -306,6 +306,7 @@ static_library("test_support") { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 75acfb6c647..a612b7b6ab2 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index dec048d7750ceb43751111542abae5584ad6eb04..29b01915c00d9022da490ccc7aa9cbfa03f4a5a1 100644 +index d66ec7ff97590eb853419527fb95b1b539d5d5d9..66254684753f08cf0a6bf64545b42cbdbd175e13 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -48,6 +48,8 @@ enum VisitSource { diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index 649fc2c92e1..27b5cc4b628 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index ddac938ffcf08bbd1ddbc56d9ab024b88e105eef..96fe9676371ced61e3d85afbc65ef69a0211ea15 100644 +index f5ae463a3747638d1f6ed0547fef877690846164..1d8aad03a9ac6aac5d907aa9082a2632ff285db2 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -305,6 +305,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -306,6 +306,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overriden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 189118918cc..7a870cc78e5 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 4c6aa66d2452a2adafc5893b604a153e27843849..99ac3bb5888c2a5447b0aefeb1c05851f02ff6e9 100644 +index 950d27873679850a2e2e159c9459b1eaf2e1359d..adff539b6e32828d22a0b08b7cdb2aba2f6e1c11 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -391,6 +391,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -394,6 +394,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 4c6aa66d2452a2adafc5893b604a153e27843849..99ac3bb5888c2a5447b0aefeb1c05851 VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -403,6 +404,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -406,6 +407,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 9bcd6786cd0..7dbf0ba0993 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index ea6acd7b55b69b79eafcc8102953f0a423fc8f2c..20e6fc00fe37fb5a00d819fe4279096d7791e87b 100644 +index 5eca4b575e3525ff798a239ec59ed8f49d5c7758..7703e46d0ad7328deaa06f8aea8b69ad852d758e 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -2646,6 +2646,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index f661ba4e68a..a8c1bde1b03 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 6ee18591ecf3f73388384d82a6530a950ff580e7..d1630518bef398e306ebbcc8ffc0e1fbc67dc2a4 100644 +index 24b18a620f3e60ed26dddfaa5d3133b5ede972fe..c9cc2bd0123b7e03171dd12ec9c5bb613a585385 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -984,6 +984,7 @@ void RenderThreadImpl::InitializeRenderer( diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index bf6e203f2d5..792e7cfbbe9 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index ad5427d971b4fe05fc52e8f15fd028a716f298d2..c9a3d57e9304e24040774da7e13f2c5517b1b9a0 100644 +index 93675096b7755cf81c5fc5f6f71912ccd71e5ca5..673f170788c6f60e91c456f00c77ca62f0994c5b 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -557,6 +557,7 @@ +@@ -558,6 +558,7 @@ "matches": [ "chrome://password-change/*", "chrome://file-manager/*" diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index c9ffe6c72b2..545d29f1154 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index 4175a190794d10b86dc6176dd2fce377fb23473b..3d36d8e492e100f544e9b16351933fa4f9261b30 100644 +index 3e80e3317d1d935aa52e6989fa33f6bf078c92b7..c619fd6d75628be68a959a59e964e2119daeb0a6 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -205,6 +205,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -207,6 +207,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { registry->RegisterIntegerPref(kTrialGroupPrefName, 0); registry->RegisterIntegerPref(kSigninBottomSheetShownCount, 0); @@ -10,7 +10,7 @@ index 4175a190794d10b86dc6176dd2fce377fb23473b..3d36d8e492e100f544e9b16351933fa4 } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -322,6 +323,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -320,6 +321,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(kSigninAllowedByPolicy, true); registry->RegisterBooleanPref(kShowReadingListInBookmarkBar, true); diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 646cd15d24c..c373e5c8ec7 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index a6f8d5595183fb8bf20fb41d2f57d332d14ee9eb..1f5afba00c42f9eb739d867ead243ef4680fde8b 100644 +index 155b67fd30b094a274ece898acb3bb7314ee3dda..cbea185fc7ed6c040313f1c177b25b2d6af42abc 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1138,6 +1138,7 @@ component("net") { +@@ -1136,6 +1136,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 974af63b820..486e94d5dd1 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 0b6fd91cb69ac806c9a5bbe787342cbdab30c37f..6433b97253843d3e1664faa20e7d5d3c8ac1a1e8 100644 +index 89286b610d40d600c5292a5d2eab3aba1445dd39..557be8c84c47a440f8846a2cc2b3730bb88844b7 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2530,6 +2530,7 @@ generated_interface_sources_in_modules = [ +@@ -2526,6 +2526,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 71991c669ba..60beeb4411d 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index eb1de8f79069f6c630846f56ebd3e4fc8c685d38..216bdd6452849b6d7862f941bfe4cdc438811014 100644 +index ed6a94c8bda24b1dad3c08b5b47059732ef72208..3ba09501f50c3f8e2cbf1047839fe266f1e0d402 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1158,6 +1158,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1157,6 +1157,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index e3d4a198e2d..803d79b123c 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index db8dd0e8fd0f71895b64a4a666b6633ad754fb09..2b93965f5ab991328a31e89990ff37b830b4c66a 100644 +index 502a79562151468d8015bccda85dfd161de8c3f6..1fb07294fc3c6f7f4efc4b580fd178a93aec6bf4 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -359,6 +359,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index de714c87515..8336d86ac3b 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index e7c8cac38d8be3c5e046891ee1a8fa7794a3e15d..dffe1cd78ff55c43a676ab5913de1517fe6cd3fc 100644 +index b7c5e74c9792cd8dcd4cb38009cf22a000592387..62123730f9fef2a21004c2f03209507b34c48a41 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -1937,6 +1937,7 @@ ImageData* BaseRenderingContext2D::getImageData( @@ -10,7 +10,7 @@ index e7c8cac38d8be3c5e046891ee1a8fa7794a3e15d..dffe1cd78ff55c43a676ab5913de1517 int sx, int sy, int sw, -@@ -2048,6 +2049,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2047,6 +2048,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } diff --git a/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch index dd79082e712..0b6cf1ea948 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-analyser_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc -index 0a921ad27c98f9d5cfb0bbe7381342bc3c1a41aa..c01fa495c2eaa9d57d1ce3422ded12bc9811a043 100644 +index b6eff79359e62bb50fbdd5e07150a7eb99f2329d..6f6fa45e09df25dd0d7b263e9f87f5c3c1939d38 100644 --- a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc -@@ -15,6 +15,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) +@@ -16,6 +16,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) : AudioBasicInspectorHandler(kNodeTypeAnalyser, node, sample_rate), analyser_( node.context()->GetDeferredTaskHandler().RenderQuantumFrames()) { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 0c179ce0d47..dede1bf0a05 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 8d2f6fcafaa3798c05a1855ee68d7bb3568652b8..3cbcbe436a9a3f74949d4aca4dcb09ea32829eeb 100644 +index 8e3ab425389eae7b5b431f613d9e853d88d5606d..4d99435d313df9e53fa93595fb67b5789acaccf0 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -@@ -5238,6 +5238,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -5441,6 +5441,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 8d2f6fcafaa3798c05a1855ee68d7bb3568652b8..3cbcbe436a9a3f74949d4aca4dcb09ea switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5781,6 +5782,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5984,6 +5985,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 8d2f6fcafaa3798c05a1855ee68d7bb3568652b8..3cbcbe436a9a3f74949d4aca4dcb09ea WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -5993,6 +5995,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -6196,6 +6198,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 3f8cc490889..75f9c4159a6 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74b11e0d1f 100644 +index 4416920a4f152a4fb5fae264979b400bc16c1710..0ee366d497a3401df62464619039d12a1ac0b694 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3004,6 +3004,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3007,6 +3007,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3035,6 +3036,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3038,6 +3039,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3065,6 +3067,7 @@ absl::optional>> +@@ -3068,6 +3070,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3079,6 +3082,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3082,6 +3085,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3112,6 +3116,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3115,6 +3119,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3258,6 +3263,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3261,6 +3266,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3658,6 +3664,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3661,6 +3667,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3673,6 +3680,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3676,6 +3683,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3765,6 +3773,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3768,6 +3776,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3820,6 +3829,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3823,6 +3832,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3830,6 +3840,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3833,6 +3843,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3881,6 +3892,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3884,6 +3895,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3912,6 +3924,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3915,6 +3927,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3942,6 +3955,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3945,6 +3958,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -3954,6 +3968,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3957,6 +3971,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 return EnsureNotNull(shader->Source()); } -@@ -3983,6 +3998,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3986,6 +4001,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4017,6 +4033,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4020,6 +4036,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4276,6 +4293,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4279,6 +4296,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4300,6 +4318,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4303,6 +4321,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4377,6 +4396,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4380,6 +4399,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index b78f578c6c31a24e9f62c190e2a99e90f91dd731..db6fb2145052fa22b4d39967748d8f74 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4724,6 +4744,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4727,6 +4747,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 8af774876fa..1c356806a10 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..510fc31a3b0fb7e90667e6abe0f7404f772716de 100644 +index b036986b35dac88ab58d572a9e77bf0b1210411a..71f9ebadaa1a2333c2d3663a0376a85e8c64d477 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -41,6 +41,9 @@ @@ -12,7 +12,7 @@ index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..510fc31a3b0fb7e90667e6abe0f7404f "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -177,7 +180,7 @@ +@@ -181,7 +184,7 @@ "includes": [1600], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/history_resources.grd": { @@ -21,7 +21,7 @@ index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..510fc31a3b0fb7e90667e6abe0f7404f "includes": [1620], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/image_editor/resources.grd": { -@@ -613,6 +616,9 @@ +@@ -617,6 +620,9 @@ "components/components_chromium_strings.grd": { "messages": [3520], }, diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index d091d0778ea..05c9216c21d 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index a2cf83d47b507c749512ea04a622af21dfd51bea..ded42cf4892decc16e90e7fcdcd07a535ede00cc 100644 +index 333801e8dae1e25cb4a39a91a6ae33e599ca6f8d..c6ea04de9f29a1ec953506909ee1c60a86a9f69a 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -7372,6 +7372,7 @@ chromium-metrics-reviews@google.com. +@@ -7357,6 +7357,7 @@ chromium-metrics-reviews@google.com.