From ce836b931bfd467f90d8d85a1f7f0afe983a4fea Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 18 Aug 2021 20:12:48 -0400 Subject: [PATCH] Updated patches from Chromium 93.0.4577.42 to Chromium 93.0.4577.51. --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- .../chrome-browser-flags-android-chrome_feature_list.cc.patch | 4 ++-- patches/chrome-browser-profiles-profile_impl.cc.patch | 4 ++-- ...er-renderer_context_menu-render_view_context_menu.cc.patch | 4 ++-- ...ser-renderer_context_menu-render_view_context_menu.h.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 2 +- patches/content-renderer-render_frame_impl.cc.patch | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 1cca2245d009..3da34c71cdc6 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index cbe2ecc29727f2a478da66c8ca0460f4a97f47e7..3e5ec1ca5c23eb099cc66d24e40d562500739fb4 100644 +index 674f56f1d8a0f6a1c5ec5c1c3ec91416060e232f..aefe9bfb508e865a0671a9c3798c81befe3a7429 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 -BUILD=4577 --PATCH=42 +-PATCH=51 +MINOR=1 +BUILD=30 +PATCH=32 diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index b754aaa99674..36628dca9e2e 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index dbf7a49288ee8e895c02f7e8f8a17cd1ec608657..8fb0f43365777c7756f282f73ea2024871d343d2 100644 +index b83ed2f1004a7bd9e1acca1bc93f81a32f4e514b..a7a05666bf51519a687404e30ebc19b617f58bd7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -314,14 +314,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index dbf7a49288ee8e895c02f7e8f8a17cd1ec608657..8fb0f43365777c7756f282f73ea20248 const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7613,6 +7613,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7617,6 +7617,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 536dbc721d4a..e3c74a727f99 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 7c62c644b31f650f7e323328c7133bed5c48d849..1834a9b89ccb7f3941c7f320598031849dd64e43 100644 +index 272fba37dc5b936d9ca6f03f57915bafca35e05e..18bb7105ca6b6502a3b09a4e1c2356ac1837f644 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -335,6 +335,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -334,6 +334,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index dbea0b166689..ec2cbdd3ee05 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 17926a44d919f6572df47fce0f5557babd3d0924..f7bf46181b5c7da0b099b951b52073b8a2266142 100644 +index 9a6b9dd9fe3c9791333b5954db7c805708520409..00990a60de163dc12f7e29957225f47b0076f521 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -373,7 +373,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -374,7 +374,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 a0e2e73f85f0..bddf17c86a3a 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 7029436a258ca3d3abd2a9ad189a3fdcc9972182..366b3d2668cbe89b8a2742586b18c5a835453a74 100644 +index f709ee1009830dda862a171da637ae7b43520c76..a719398dc73f99c6787a1ea670475761ebd20103 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1772,6 +1772,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1788,6 +1788,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 64a506407944..fe522ab1b7d6 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,8 +1,8 @@ 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 7b6f19105c8ec62a19c88da779810d177e5db2a8..a209182134913735ae3c992692ca85f607be44a3 100644 +index 3e75832061fd2d07c624a81118a8aafbb2c6aa80..3eabff7369b4576a041608f80350604d36a7d29d 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -126,6 +126,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, +@@ -130,6 +130,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index ae7691580391..3fb476bb27df 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 1625f8917ac257f11f4637ea60eca586ec2492a3..1f166bdc58544087a96905ace8cd928be4d5dccc 100644 +index 139a04d6cbc1376340cf73a395e051fd2c7c9b11..6bcafc12aef2172eff9969bdcfb5a9bfdb93dd9e 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1284,6 +1284,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 aa265fe1ae80..0fb7a1adb2fd 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 c8139a90c462297ceaed71c5db1be8b35e310f20..c69c9f723d2f3160b9223884760afb1fa9295631 100644 +index 118192cb4ea365f4b8fc84a802b9c6bb030461fc..759855cac6d5e1b9262dd0eea0fc131713a1c897 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4496,6 +4496,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4517,6 +4517,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame())