update patches

2021-05-13 13:18:09 +00:00 · 2021-05-13 13:18:09 +00:00 · 333ec0d4c2
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.

 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 7d9019b87c8a016a1393c29d2ecf9966aa8f575c..160522d6bebfd47400733267ff3d60b37fff7f17 100644
+index d5bb3412094125492ecf9b5d2c34ce5df16a7c6f..cce3fb48264b0585fa4672d6249c11510e4e5d9d 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
@@ -237,6 +237,10 @@ int GpuMain(const MainFunctionParams& parameters) {
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@ -23,7 +23,7 @@ index fa860cddc22da75967796674e9b467f8c726a368..730c7ddd2838eb50f6f5f0676f0f16f7
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 93c52c64173085b28e2391b59b089edb1f67777b..c2b9b96589183d1a4fae8593e7994a10baa5e29b 100644
+index b1853deabf58abc022f1ae3ec3b4836a64f9ee40..e3a89fec6fd45262e75e557da1d0ae10f3295828 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
@@ -4130,6 +4130,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
--- a/patches/chromium/add_setter_for_browsermainloop_result_code.patch
+++ b/patches/chromium/add_setter_for_browsermainloop_result_code.patch
@ -10,7 +10,7 @@ valid use cases for setting custom exit codes of the main loop.  This
 exposes a simple setter that embedders can call.

 diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
-index 240fc57ad29fc684d802e4601b72cf3373d69c6b..7123c74af7f4077ecfa451539d49f8e232150317 100644
+index 391e178c5a89ab96becd3df3c52547a50733ec7c..b71ae51526afc89d979cfd80c57488b2d49d05a0 100644
 --- a/content/browser/browser_main_loop.h
 +++ b/content/browser/browser_main_loop.h
@@ -166,6 +166,10 @@ class CONTENT_EXPORT BrowserMainLoop {
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.

 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index a192ba52723032cbe6daaff20a64f278a1967777..d8200f463443f11dafd84f4620b9c7f109912cdd 100644
+index a252a48e477864755ffb0172405f43361aee736f..adb1264afad587a96f1cfe553bc39702b8f79323 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -5718,6 +5718,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -5717,6 +5717,7 @@ void RenderFrameHostImpl::CreateNewWindow(
           last_committed_origin_, params->window_container_type,
           params->target_url, params->referrer.To<Referrer>(),
           params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index a192ba52723032cbe6daaff20a64f278a1967777..d8200f463443f11dafd84f4620b9c7f1
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 92ed79fc561b0789ab164b2c28a7860159c60c38..aed19709076c8b3d0df42b4dcb994f8bbe2d6026 100644
+index 71b2dc3f93801aaba9f70c209e6eb36c55a1d438..6f9c6192e7a09fac63aede3bf84bf1dc34d27419 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3650,6 +3650,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3659,6 +3659,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
   }
   auto* new_contents_impl = new_contents.get();
 
@ -39,7 +39,7 @@ index 92ed79fc561b0789ab164b2c28a7860159c60c38..aed19709076c8b3d0df42b4dcb994f8b
   new_contents_impl->GetController().SetSessionStorageNamespace(
       partition_id, session_storage_namespace);
 
-@@ -3692,12 +3700,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3701,12 +3709,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
     AddWebContentsDestructionObserver(new_contents_impl);
   }
 
@ -150,7 +150,7 @@ index b1cfa654259d431adfada00a00f9bfc8ae5ab292..484d36de2ac0ef3b1d19bbd0d6c79db8
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 2f302654b22364e0579310571bed92c716eed342..d094fb4cf201305ce14f07eac5840e5a492c8736 100644
+index 800184b34a57c3287a314064f1944c827c602f7f..6c49fb6234087bef6678b7a89b484cf2e583f771 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
@@ -27,6 +27,7 @@
@ -161,7 +161,7 @@ index 2f302654b22364e0579310571bed92c716eed342..d094fb4cf201305ce14f07eac5840e5a
 #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
 #include "third_party/blink/public/web/web_frame_widget.h"
 #include "third_party/blink/public/web/web_local_frame.h"
-@@ -317,6 +318,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -313,6 +314,10 @@ WebView* RenderViewImpl::CreateView(
     params->impression = blink::ConvertWebImpressionToImpression(*impression);
   }
 
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
   void AddNewContents(content::WebContents* source,
                       std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 9ce5f2eed289ed9d427abddde098bfcd09293db4..37ccef65290b4e996d8326886117f6b7b43f56c3 100644
+index edcdf9990186346434a55372c5b894f6a8274f8b..db7d13190a6c4a81df496ed5f02db25faef61dd2 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3602,8 +3602,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3611,8 +3611,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
 
   if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                        source_site_instance, params.window_container_type,
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes

 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 6d324db8fefe630a87d703f2030a5320eb7e6389..9e3c8abfdcb8c0683abec613e368b285e0c1813f 100644
+index 75ec4a443cebc70fa2c66a13a73450f809aede10..92223d002d6fcc2b6136d19bb6f726a40b15aec2 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -6336,6 +6336,7 @@ static_library("browser") {
+@@ -6346,6 +6346,7 @@ static_library("browser") {
     deps += [
       "//components/spellcheck/browser",
       "//components/spellcheck/common",
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@ -229,7 +229,7 @@ index 046cd7582b11760a3d512ca8e63d495b9b5f35be..fc44552756eda92e376a31943842922a
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index cbb30f8900ed07d5cccbf250f2f1e6fafb66b40e..411fabb7e8c3e2a1aceb9db0fefdc4c6d3a9c156 100644
+index a361e3a9aebaac7fe171709022aad21049c1c109..c29b7a1ba3377833a565048b28370243babbef0b 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
@@ -225,6 +225,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@ -241,7 +241,7 @@ index cbb30f8900ed07d5cccbf250f2f1e6fafb66b40e..411fabb7e8c3e2a1aceb9db0fefdc4c6
     sandbox::policy::switches::kGpuSandboxAllowSysVShm,
     sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 9ca967c31df3a144c40c14a641765a41c48f0f68..90507c84cb87ca889d9971a2c66db8e1cbdd5097 100644
+index 91ae85f1f37d5106fe3ff2d5920e506299954096..add7e2b5e4a9d241da3bba8ef87f5eedbc5987cb 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -210,6 +210,7 @@
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.

 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 42d4d1390a4bb5217a5b70855038d7f5aec7caf3..d0e6dc5c1c8b1201aafbadfa901113fa648aa439 100644
+index 741960ff63e83072846ab4be12c8191e7dd0c4b4..d1309bc4807189151d8d664212b7278dce444e44 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -489,7 +489,11 @@
+@@ -478,7 +478,11 @@
     return;
 
   host()->WasHidden();
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 88f3f7603431d6c64e483fc7e836f4d6d2cd099c..718bbe30cdcd6f5a0118e9b9f71a26762fcd2b32 100644
+index 23e0d6312912648fda6e0795c082f6e179a56dc0..504fa6dc547a4c3152677abf152a1bf063f77155 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -711,6 +711,9 @@ void RenderWidgetHostImpl::WasHidden() {
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393

 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 8b23d276dbc7ba0ec27ab4e9e0fd916f49f8f423..f38393312a391d15bc77320031dded813ea1e4bc 100644
+index 1959f22a9a62fdbe251d1dd06ae817bc47b38d4e..124c9170020742388fd25cf2b44b7e5a716e93c7 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
@@ -2274,7 +2274,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@ -33,7 +33,7 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
   DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
 };
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index fa84ecca47caf78174e9f588d2a1c1f65ebb157d..8bfe1d73ee5cd3d32b9190585747faeea483fcfb 100644
+index f84a1531f0f571761497905d0e02e0f168dd9686..4c442de9a649c50793fbca50d7b8ea1c58336fc0 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
@@ -1140,6 +1140,13 @@ void NetworkContext::SetNetworkConditions(
--- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
@ -48,10 +48,10 @@ index 9f1acca2bdb697b79a01362a9a5d8dd098eca925..c57c03b838a773d41614002afee27520
   // This interface should only be implemented inside content.
   friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index b65e4cc345b05292e1c31d0b05dacc1363d641a8..fe2f8b68cd7cc3f4417ae70dcd711ae56883e117 100644
+index 60e6bce680b1e03888b36026e712d5806fc48256..7d004e0eb6f1f03669a99cfe7777cbd012205a9f 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
-@@ -200,6 +200,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
+@@ -194,6 +194,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
   static WindowOpenDisposition NavigationPolicyToDisposition(
       blink::WebNavigationPolicy policy);
 
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@ -90,7 +90,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostNSViewBridgeOwner);
 };
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index f46b1d431957d6fb86f67d340c02469cb9457188..78c4c7588af478823c3b2cdad52164e328b7f39e 100644
+index b848b8be5e94d2d5bbcfd60379b1f9a74190cd9b..22673e3ba49204f6b5c5b1f385046ff4a2f24fa2 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -47,7 +47,9 @@ class ScopedPasswordInputEnabler;
@ -103,7 +103,7 @@ index f46b1d431957d6fb86f67d340c02469cb9457188..78c4c7588af478823c3b2cdad52164e3
 @class RenderWidgetHostViewCocoa;
 
 namespace content {
-@@ -658,10 +660,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -651,10 +653,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // EnsureSurfaceSynchronizedForWebTest().
   uint32_t latest_capture_sequence_number_ = 0u;
 
@ -117,10 +117,10 @@ index f46b1d431957d6fb86f67d340c02469cb9457188..78c4c7588af478823c3b2cdad52164e3
   // Used to force the NSApplication's focused accessibility element to be the
   // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 9a6df39be13403107c5864f366a461bd66cb1aff..42d4d1390a4bb5217a5b70855038d7f5aec7caf3 100644
+index cf17dc16c67a74874df5671e0b579235755058a8..741960ff63e83072846ab4be12c8191e7dd0c4b4 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -238,8 +238,10 @@
+@@ -241,8 +241,10 @@
 void RenderWidgetHostViewMac::MigrateNSViewBridge(
     remote_cocoa::mojom::Application* remote_cocoa_application,
     uint64_t parent_ns_view_id) {
@ -131,7 +131,7 @@ index 9a6df39be13403107c5864f366a461bd66cb1aff..42d4d1390a4bb5217a5b70855038d7f5
 
   // Disconnect from the previous bridge (this will have the effect of
   // destroying the associated bridge), and close the receiver (to allow it
-@@ -1399,8 +1401,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1435,8 +1437,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 
 gfx::NativeViewAccessible
 RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -142,7 +142,7 @@ index 9a6df39be13403107c5864f366a461bd66cb1aff..42d4d1390a4bb5217a5b70855038d7f5
   return [GetInProcessNSView() window];
 }
 
-@@ -1444,9 +1448,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1480,9 +1484,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 }
 
 void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -154,7 +154,7 @@ index 9a6df39be13403107c5864f366a461bd66cb1aff..42d4d1390a4bb5217a5b70855038d7f5
 }
 
 bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -1935,12 +1941,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1976,12 +1982,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 
 void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
     const std::vector<uint8_t>& window_token) {
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.

 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 482d6022fd5076f55d339684e07d556e4cb3f220..fa84ecca47caf78174e9f588d2a1c1f65ebb157d 100644
+index 3b549723c60541759b51a43068e5d21a25704c61..f84a1531f0f571761497905d0e02e0f168dd9686 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
@@ -117,6 +117,11 @@
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@ -108,7 +108,7 @@ index 71dad766e05ac4726e1e18159f2af5ea01079a91..ef8e55a4420288fe64c99e68d0a649a9
       const GURL& document_url,
       mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index efe1470d3af7c923f2a65ce4988f078f6e56672e..e68880e344f8efd790da07b2fd1071a2666f489c 100644
+index f57a5eb44feec2689e8089da72458e7337207b7e..f7ef5fd9a4f4e466d84f2241a961abb92711363c 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2160,7 +2160,7 @@ void RenderProcessHostImpl::CreateNotificationService(
--- a/patches/chromium/put_back_deleted_colors_for_autofill.patch
+++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch
@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.

 diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
-index 043ace0c33285d48a78541862ef9bc75d178dbe4..1fbe82d1baca7e296a2f44762fc5c99d66d60532 100644
+index 80d9beaaa55b257bed4d2011949b8565926c2d97..1438bdfc934da7b519bf0c973ffba71d21a8053c 100644
 --- a/ui/native_theme/common_theme.cc
 +++ b/ui/native_theme/common_theme.cc
@@ -68,6 +68,14 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id,
@ -46,7 +46,7 @@ index 043ace0c33285d48a78541862ef9bc75d178dbe4..1fbe82d1baca7e296a2f44762fc5c99d
       // Keeping the kColorId_NumColors case instead of using the default case
       // allows ColorId additions to trigger compile error for an incomplete
 diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h
-index 84848edbbe9de7ef9fe6e2ab0a34d3b9428cde10..5e07980e4793cc3b19140510fb3fd3b23c6a88ef 100644
+index 083640808cd6a4a5e6e65d715c77ef58d090ba1e..d7d2fe4e0ada417769cbfe8390b8e2b134549962 100644
 --- a/ui/native_theme/native_theme_color_id.h
 +++ b/ui/native_theme/native_theme_color_id.h
@@ -157,6 +157,11 @@
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@ -30,7 +30,7 @@ index fb25b91e254ca03002fda226861ff5b9c24f6b11..752f5e26b4f60561f38f08a8ce10cbce
   // RenderWidgetHost on the main frame, and false otherwise.
   virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 718bbe30cdcd6f5a0118e9b9f71a26762fcd2b32..51766160240c5fcaaa25dc3388e2be63c70511b4 100644
+index 504fa6dc547a4c3152677abf152a1bf063f77155..b45142d03b346df41ba95c047a55310c0a8bb026 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1945,6 +1945,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@ -43,10 +43,10 @@ index 718bbe30cdcd6f5a0118e9b9f71a26762fcd2b32..51766160240c5fcaaa25dc3388e2be63
 
 void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index aed19709076c8b3d0df42b4dcb994f8bbe2d6026..9ce5f2eed289ed9d427abddde098bfcd09293db4 100644
+index 6f9c6192e7a09fac63aede3bf84bf1dc34d27419..edcdf9990186346434a55372c5b894f6a8274f8b 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4193,6 +4193,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4202,6 +4202,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
   return text_input_manager_.get();
 }
 
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.

 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index fe8443d5411c73f1fb71fd20315173b0023be758..d4cd7ddcd50c512d07ca2175179e41634d84d588 100644
+index 581ba709bbb6e42d8fcff998767995722a01f471..d2f7fa36690da6c62ad2eba9f88cf9c1660260b3 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -630,6 +630,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -663,6 +663,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
   return false;
 }
 
@ -24,7 +24,7 @@ index fe8443d5411c73f1fb71fd20315173b0023be758..d4cd7ddcd50c512d07ca2175179e4163
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 885d2f0198ff5d7d87047a66d688ff572112ba02..96ce338ea6e2ef2c0a785dfe4411b05c9ec44035 100644
+index 9ed6f7cf7d46a83efc1f4e000810ebbd1ddfef9c..77bb265fd0ac0aa376bdce37bd2ee7e04ea5bb05 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -25,8 +25,10 @@
@ -38,7 +38,7 @@ index 885d2f0198ff5d7d87047a66d688ff572112ba02..96ce338ea6e2ef2c0a785dfe4411b05c
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/visibility.h"
 #include "content/public/common/widget_type.h"
-@@ -65,9 +67,11 @@ class CursorManager;
+@@ -66,9 +68,11 @@ class CursorManager;
 class MouseWheelPhaseHandler;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewBaseObserver;
@ -50,7 +50,7 @@ index 885d2f0198ff5d7d87047a66d688ff572112ba02..96ce338ea6e2ef2c0a785dfe4411b05c
 class WebCursor;
 class WebContentsAccessibility;
 class DelegatedFrameHost;
-@@ -148,6 +152,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -145,6 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
       bool show_reason_unoccluded,
       bool show_reason_bfcache_restore) final;
 
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.

 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index c17242f7d07f74c1a91d0ef44665a3cfb29b4e40..2b30bd1094e494d1f6eef5a57dc23e9ac6525634 100644
+index 7fb41d34382545e9391aabfb2caf77d57a3cfa89..60db2236be7bbe358493a18f4c6d302923190a22 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -153,6 +153,15 @@ void ExtractUnderlines(NSAttributedString* string,
@ -61,7 +61,7 @@ index c17242f7d07f74c1a91d0ef44665a3cfb29b4e40..2b30bd1094e494d1f6eef5a57dc23e9a
   // We only handle key down events and just simply forward other events.
   if (eventType != NSKeyDown) {
     _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1726,9 +1746,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1728,9 +1748,11 @@ - (NSAccessibilityRole)accessibilityRole {
 // Since this implementation doesn't have to wait any IPC calls, this doesn't
 // make any key-typing jank. --hbono 7/23/09
 //
@ -73,7 +73,7 @@ index c17242f7d07f74c1a91d0ef44665a3cfb29b4e40..2b30bd1094e494d1f6eef5a57dc23e9a
 
 - (NSArray*)validAttributesForMarkedText {
   // This code is just copied from WebKit except renaming variables.
-@@ -1737,7 +1759,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1739,7 +1761,10 @@ - (NSArray*)validAttributesForMarkedText {
         initWithObjects:NSUnderlineStyleAttributeName,
                         NSUnderlineColorAttributeName,
                         NSMarkedClauseSegmentAttributeName,
--- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
+++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
@ -88,7 +88,7 @@ index 6191d4774ae35f00c3b58f62719962de616c8ad7..f717ae1d8e3bf642792f1dcfebbaa287
   // |url|. If the function returns a valid |new_url|, the request must be
   // updated to use it.
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index c2b9b96589183d1a4fae8593e7994a10baa5e29b..8b23d276dbc7ba0ec27ab4e9e0fd916f49f8f423 100644
+index e3a89fec6fd45262e75e557da1d0ae10f3295828..1959f22a9a62fdbe251d1dd06ae817bc47b38d4e 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
@@ -4908,6 +4908,22 @@ void RenderFrameImpl::BeginNavigation(
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.

 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 887a6860a61d6c353f3b3c86263c81acb7d2ace2..46585f2188f64734b6130bcce367ec2078148635 100644
+index 550ef8d0da1434602f7bea4c0b0a070403a6085e..27901df283059c61401ec25aec4205f82eed9dee 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
@@ -1248,7 +1248,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
@ -17,4 +17,4 @@ index 887a6860a61d6c353f3b3c86263c81acb7d2ace2..46585f2188f64734b6130bcce367ec20
 +  return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
 }
 
- bool RenderThreadImpl::IsUseZoomForDSFEnabled() {
+ gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.

 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index e68880e344f8efd790da07b2fd1071a2666f489c..9ca967c31df3a144c40c14a641765a41c48f0f68 100644
+index f7ef5fd9a4f4e466d84f2241a961abb92711363c..91ae85f1f37d5106fe3ff2d5920e506299954096 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -387,10 +387,18 @@ class RendererSandboxedProcessLauncherDelegate
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 37ccef65290b4e996d8326886117f6b7b43f56c3..83c73c17461ff8fa7543c112e812dcaca592d133 100644
+index db7d13190a6c4a81df496ed5f02db25faef61dd2..1f884e66eee5cf36442ceb6dc22a30a4723cf55b 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2775,6 +2775,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2784,6 +2784,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
   frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
                    params.main_frame_name);
 
@ -25,7 +25,7 @@ index 37ccef65290b4e996d8326886117f6b7b43f56c3..83c73c17461ff8fa7543c112e812dcac
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -2785,6 +2791,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2794,6 +2800,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
     view_.reset(CreateWebContentsView(this, delegate,
                                       &render_view_host_delegate_view_));
   }
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.

 diff --git a/BUILD.gn b/BUILD.gn
-index 313c1d51aab36d4324955b6468be13e3073bf413..e0bae1c3b9611eafd7333459c0cfd81b4f4235f7 100644
+index 1b22837f22bb2a6813267ef2c0ab16a2a04f1f29..43c7c0c81790a90d3ff85724965556f525501b29 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -500,7 +500,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index 313c1d51aab36d4324955b6468be13e3073bf413..e0bae1c3b9611eafd7333459c0cfd81b
     defines += [ "BUILDING_V8_SHARED" ]
   }
 }
-@@ -5176,7 +5176,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5191,7 +5191,7 @@ if (current_toolchain == v8_generator_toolchain) {
       "src/interpreter/bytecodes.h",
     ]
 
@ -30,7 +30,7 @@ index 313c1d51aab36d4324955b6468be13e3073bf413..e0bae1c3b9611eafd7333459c0cfd81b
 
     deps = [
       ":v8_libbase",
-@@ -5214,6 +5214,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5229,6 +5229,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
 
     configs = [ ":internal_config" ]
 
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@ -19,7 +19,7 @@ index 62b4be5bf0e64f04da22cbf32643ab86cb901bb6..f7f0e7ee899746be121f6b840988cd8e
   isolate->default_microtask_queue()->PerformCheckpoint(this);
 }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index d03c65b078f17e6ddba7354c175751b06557c3e8..0108642b96c30bb6928f317870788800681c1222 100644
+index 00b47db6dc7146ad3f6611115526b04d513cfcef..ca818d2bfacc080c75210c2e3c41301690727490 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
@@ -5822,9 +5822,9 @@ void Heap::DeinitSharedSpaces() {
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).

 diff --git a/BUILD.gn b/BUILD.gn
-index 311ad20094357e67be03802bd1be5aafa550529d..b520050f54a3ab4f2f1f05f3eea6bede0d17b4d0 100644
+index 8d9aa65953c407e367aec8f7b498c20659db3dcb..5689af600d5e98e1cec2032e477848836c643d46 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -500,6 +500,10 @@ config("internal_config") {
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.

 diff --git a/BUILD.gn b/BUILD.gn
-index e0bae1c3b9611eafd7333459c0cfd81b4f4235f7..311ad20094357e67be03802bd1be5aafa550529d 100644
+index 43c7c0c81790a90d3ff85724965556f525501b29..8d9aa65953c407e367aec8f7b498c20659db3dcb 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5188,7 +5188,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5203,7 +5203,6 @@ if (current_toolchain == v8_generator_toolchain) {
 
 if (current_toolchain == v8_snapshot_toolchain) {
   v8_executable("mksnapshot") {