From 1e70fcd5fd35f38c8e7ad065e08a1f910839fb43 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 7 Jan 2021 10:52:53 -0500 Subject: [PATCH 1/2] Updated patches from Chromium 88.0.4324.51 to Chromium 88.0.4324.68. --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-android-chrome_java_sources.gni.patch | 4 ++-- ...rg-chromium-chrome-browser-app-ChromeActivity.java.patch | 2 +- ...rome-browser-sync-settings-ManageSyncSettings.java.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 6 +++--- ...hrome-browser-flags-android-chrome_feature_list.cc.patch | 4 ++-- patches/chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- ...-renderer_context_menu-render_view_context_menu.cc.patch | 4 ++-- patches/chrome-browser-ui-tab_helpers.cc.patch | 4 ++-- ...-browser-ui-webui-settings-site_settings_helper.cc.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 2 +- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- ...k-renderer-core-html-canvas-html_canvas_element.cc.patch | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 76113b33f499..110f7d890aaa 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index afd73f87c276497d26af701b1475311a7330d6a2..5bb5d44b5747c886fb2cb497f62d14b050a04fa6 100644 +index 561c7475915e020dd4d9d6c1da75eca9a032da2a..7b0dc8cbcfa6861e6159fe2cf480270c366c0810 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=88 -MINOR=0 -BUILD=4324 --PATCH=51 +-PATCH=68 +MINOR=1 +BUILD=20 +PATCH=65 diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 06dc4a24d885..fa22f7f83ead 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 86597ad5745bfdc4318da347549486a4b3997f78..f1fa1e563306add61002c966035d3b80be354d66 100644 +index 9a17ae7e538ca73ecb8c397a9a912725e7a2ce72..8be6929def3812c03261d02445a7e2772c78e369 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1693,3 +1693,4 @@ chrome_java_sources = [ +@@ -1695,3 +1695,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 15f30cb2b11f..ef6213a4cdc8 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index d2606e4b6c4c3cbebe1e363e43d4a73d19377e68..eca88feaa4617cb9e893e7b5467e25e9d7f352fd 100644 +index a97bb23faaac78dbc96a0882841f8abc4544da42..02afc7f8052b75c3c6a88104a6b6493d7d496065 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -330,7 +330,7 @@ public abstract class ChromeActivity diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 803f642bbe1e..f3f7335a6fc9 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 8e622ca4a0269c70d199cd773e040a076ad05b52..cf9ede4c52b6c7b650d009d4ce490d9086439702 100644 +index 4a990dcd80cbf02edff9d51a140f9aedb9bce834..856f1735d66d33a08750ab08efc173701fca0332 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -26,7 +26,7 @@ import androidx.appcompat.app.AlertDialog; @@ -11,7 +11,7 @@ index 8e622ca4a0269c70d199cd773e040a076ad05b52..cf9ede4c52b6c7b650d009d4ce490d90 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -366,7 +366,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -367,7 +367,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index c9a172b85099..54cda0b0a07a 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 a7b0f89b47a0b1025f091ba18270f21ddebeeff9..d7e18716ae64e3ead55107ab973fd3181a6aba82 100644 +index 2ce41b55b4052bf79ffffa270bf3e7830edec9e8..b5c4f565b05541c780dc6c97d4ed55a6d987808c 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2423,6 +2423,7 @@ static_library("browser") { +@@ -2432,6 +2432,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 92a8e078db3f..fea8bf467895 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 107ad9402c2e3d2bae02e414315442178f447224..cda90d691a49a065eaa00c1d1cebbf0e883044c3 100644 +index 5040542f30fbb8b6789226738f91b21a2815111f..31408691a856793ea0f33edf56ace182ba97d10e 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -298,14 +298,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -299,14 +299,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 107ad9402c2e3d2bae02e414315442178f447224..cda90d691a49a065eaa00c1d1cebbf0e const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6780,6 +6780,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6784,6 +6784,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 14bdbc2a25f3..033dfbdd787f 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index c226d798ea37ac06928e59ee6941918190588e9b..127dd07ccb862e9b338cd17ea67b274eb678d71c 100644 +index 1c3dca04675f9297bd4658e236dce5dfc40b9087..63e0cc46e2762b3f6b5526aa6cfdb77739acf488 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -292,6 +292,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -294,6 +294,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index ece59e2668ea..bc704bdd3b4c 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 7e31648f1a8cde7b84a3764c80930309138b9ec2..d7d925a3de64aa8574dc099b74638503477734d1 100644 +index f92fc6b05836bf9da4ec680ce0a9afaf6ac0e23f..0a6e667da68620b3b95e76d8ea98b8e07960ed31 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -764,6 +764,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -765,6 +765,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 7e31648f1a8cde7b84a3764c80930309138b9ec2..d7d925a3de64aa8574dc099b74638503 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1029,6 +1030,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1031,6 +1032,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); 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 533dee9ab3db..81a332916133 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 d0578f71b353dd087bd9e6edc8efa4dfb1d4c215..54833e552d97ffca2e1edbb37a4fb523ebd88e40 100644 +index e441083a239911268f3f9ba5397fbe24319bdbc0..24061a2b1366bf17988f28fda6134dc98537f5b3 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1632,6 +1632,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1635,6 +1635,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index af2257bd2231..82f2831712dd 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 4fb7af3b12fb837a8b0c64cd6dddec4cc561eb22..b14cca336cb000a42c72bb268b1d1ba5f0f16920 100644 +index 1358314e4df60bca3be0637167f263e585491324..9bd017f0741d514acfbbb4802be39d3a74452cfa 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -483,4 +483,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -486,4 +486,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-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 7b6d0f37f9dc..c7820db6ecca 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 0f5493f32679e17705f9b5d12346e83a36acfe01..dbc7e70271f9069a5f53c64678bbe934b77451b9 100644 +index cc79a7320b12986756dfeed5cd9f3283373dd6f4..b4ed1441c1755eed3863ab28950ba3cbb0810d01 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -149,6 +149,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index da2b9540f4fe..91a184e56f53 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 430ba501b49cc60b103219a54517e6d3e9b937ce..faca667fe68e858061ba82892e0f4b5b6b30fc39 100644 +index 4579f62b5796a5d6ce1ffa50cf3082c13f906fe0..f294bc5d26685ebbead1217bf07ad1ee4c392002 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -868,6 +868,7 @@ if (!is_android) { diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 6dea8300c4e3..e9632f0e3c3a 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 454432392c89119b20ed973a687865fbcbd0e1c2..d33b4bfd6af646c0db89f3ba651f3f4b3ea415b3 100644 +index c836b113e9850bf4dfb1ba6323eced8de8292b1b..ca987ff0a6fbc818b8286f96f79c339b74a642c1 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4888,7 +4888,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4893,7 +4893,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (render_view_->GetWebView()->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 4096bee17e6b..22a868f6a91e 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 43f5cb6b0c287dbcbc80f29b75114a0cd38b494a..8b9decc9c90e5d299688f4e0376f6f0bc5089e74 100644 +index 4489838b4ed6c8b365a976642e4050ef2a1e417a..803381a9b5fcbd120bf4420dae299abf05cec5a5 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -944,6 +944,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -945,6 +945,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { From 5528e09fd058d4d9a50f88ffffdc7935f5d92bb2 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 7 Jan 2021 16:45:08 -0500 Subject: [PATCH 2/2] Updated patches from Chromium 88.0.4324.68 to Chromium 88.0.4324.79. --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-android-java-AndroidManifest.xml.patch | 6 +++--- ...hrome-browser-flags-android-chrome_feature_list.cc.patch | 4 ++-- patches/components-permissions-permission_uma_util.cc.patch | 2 +- patches/third_party-blink-renderer-modules-BUILD.gn.patch | 4 ++-- ...dules-canvas-canvas2d-base_rendering_context_2d.cc.patch | 6 +++--- ...odules-canvas-canvas2d-base_rendering_context_2d.h.patch | 2 +- ...tograms-histograms_xml-histogram_suffixes_list.xml.patch | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 110f7d890aaa..668e3847118d 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 561c7475915e020dd4d9d6c1da75eca9a032da2a..7b0dc8cbcfa6861e6159fe2cf480270c366c0810 100644 +index 21dd793e560d4020168ec92c378604433c39ca7a..7b0dc8cbcfa6861e6159fe2cf480270c366c0810 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=88 -MINOR=0 -BUILD=4324 --PATCH=68 +-PATCH=79 +MINOR=1 +BUILD=20 +PATCH=65 diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index fad5c82c4628..1cadc90f1a5a 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 4f73e753eb851db0c3547a5ee636b94ded5350fd..5939198b6c899268128985999d3348b9e4e0c6d7 100644 +index c90fe55521d7bcd1ae214a71ad4556b1ad839075..bfaef9baff168f8558f10ef60c9107c369c9e889 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,7 +38,9 @@ by a child template that "extends" this file. @@ -54,7 +54,7 @@ index 4f73e753eb851db0c3547a5ee636b94ded5350fd..5939198b6c899268128985999d3348b9 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1171,6 +1182,7 @@ by a child template that "extends" this file. +@@ -1176,6 +1187,7 @@ by a child template that "extends" this file. {% endif %} @@ -62,7 +62,7 @@ index 4f73e753eb851db0c3547a5ee636b94ded5350fd..5939198b6c899268128985999d3348b9 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1253,6 +1265,7 @@ by a child template that "extends" this file. +@@ -1258,6 +1270,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 033dfbdd787f..767e3b65cf32 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 1c3dca04675f9297bd4658e236dce5dfc40b9087..63e0cc46e2762b3f6b5526aa6cfdb77739acf488 100644 +index 8265ccff901627704ca60f79d443bf7983f05095..5d41e852f642e229ff3a381247fa083e380c31cf 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -294,6 +294,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -295,6 +295,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 20c5f7f5d1f1..f8e5f0004bc9 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index f88ed175ed29a9d9bed7c2f5531c8a1103fc2b76..071964edb7b3fee5fb33181183f40a3c53a36170 100644 +index 600f793665021cb8d1ecf6f3f275a153b8cd6fd2..bc64b814a8c4bf537893b76e7850b2c50eff72f0 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -50,7 +50,7 @@ namespace { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 14ba48815cd3..1990796b954f 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 5f15c060e2d16f04c53717f4e85e6e3cd4dedb9f..916fc2b1c9a46364456b447daf6768ca6b457a08 100644 +index 79788bf60dbc787da89a1e600858eda5c451a962..cf757bb85698400dde4450cadb56c7b9829c8089 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 5f15c060e2d16f04c53717f4e85e6e3cd4dedb9f..916fc2b1c9a46364456b447daf6768ca config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -166,6 +167,7 @@ component("modules") { +@@ -173,6 +174,7 @@ component("modules") { "//third_party/blink/renderer/modules/xr", ] 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 944db3ebbb84..df8ede2bcde7 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,8 +1,8 @@ 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 c12b280843456c2c81df2bf598b5edb427c345cc..b39b8b82f8683f8ce044a5b3175590c37e677928 100644 +index efc376143b4a1b4d2ba0e36410377947ab35abce..138270b875d3312538f7cc7fff05a4e30789da67 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 -@@ -1609,6 +1609,7 @@ ImageData* BaseRenderingContext2D::createImageData( +@@ -1596,6 +1596,7 @@ ImageData* BaseRenderingContext2D::createImageData( } ImageData* BaseRenderingContext2D::getImageData( @@ -10,7 +10,7 @@ index c12b280843456c2c81df2bf598b5edb427c345cc..b39b8b82f8683f8ce044a5b3175590c3 int sx, int sy, int sw, -@@ -1696,6 +1697,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1683,6 +1684,7 @@ ImageData* BaseRenderingContext2D::getImageData( return nullptr; } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch index 946a37e8978f..ea1e767c425b 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -index 8b6f4e694150e7bc517c31c3cefe84ac2b519fae..107dd4e4ba3ca8cb2947bf7690fe23000bae638f 100644 +index 57554d72d861a89d5d24f15b31e261f8575bb4db..6396c1ebe3c69e4c6a21faa2241ad0bb94fdeabd 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h @@ -326,6 +326,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index c1a76d9c7aaf..2680b48b9e33 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index 70c76038de760cbb478c8118d1bf872340d15482..0b2c5aebc6cf10564467f190bbc3742fa94c351a 100644 +index fbe52bd9e55a57720275ac1eb6c1baffad3211ca..ea2e0a20577a914612f06f48c4523de25b623f0e 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -13747,6 +13747,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -13748,6 +13748,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.