chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499)

* chore: bump chromium in DEPS to c04c17506a1b5941370b91dfa44eda7ec31e9793 * update patches * chore: bump chromium in DEPS to 8a4687263763f306659d04cef8f0a12a9e504d57 * chore: bump chromium in DEPS to 3a75ada69d1ac06d6903a2c981ab90a8162f1ba0 * update patches * chore: sync StartRemoteDebuggingPipeHandler usage CL: https://chromium-review.googlesource.com/c/chromium/src/+/2536354 Added 'on_disconnect' OnceClosure arg to StartRemoteDebuggingPipeHandler * chore: add WebSocketHandshakeClient::OnFailurea CL: https://chromium-review.googlesource.com/c/chromium/src/+/2527889 Add an empty stub to satisfy parent class' pure virtual method OnFailure(). NB: Use of empty impl comes from WebRequestProxyingWebSocket. Co-authored-by: Charles Kerr <charles@charleskerr.com>
2020-11-16 17:57:42 -08:00 · 2020-11-16 17:57:42 -08:00 · cad2d8b4aa
commit cad2d8b4aa
parent a9924e1c32
27 changed files with 119 additions and 111 deletions
--- a/2
+++ b/2
@ -14,7 +14,7 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '2935b18f375adc5df74b86afdff676989ced8cd3',
+    '3a75ada69d1ac06d6903a2c981ab90a8162f1ba0',
  'node_version':
    'v14.15.0',
  'nan_version':
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@ -23,10 +23,10 @@ index 615b7359548d93fa408688e1d90d2bc8082c0c9c..5c4ba7f603f2780d07794473624e7525
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 340642fd854c915e55f6668426f218eafa6c0de9..4f0e7563d263569f34eb336426a9bd4e28800032 100644
+index de20605cb15af9971a05238d9a6bd9408529b45c..d4210bec6eb6efb401b64dbd9d196891c7b4e551 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4792,6 +4792,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4789,6 +4789,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@ -14,7 +14,7 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.

 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 4315a68fb8d56da4d280d1389d51eb5981ebc843..ff37c2d7c4d07883e6844d0df3db412f73991924 100644
+index 7492c0b791bff1f9bd2a2abf005446303b2a7860..eda9c201b970ac83eda30808d9361e4fdac732ff 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -635,10 +635,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
--- 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 382127e4aa4bf85f8fe5342db987c81973618395..45a9a5211906040fd70477ca04b8fb35d1ec4b37 100644
+index a7217c07e004135e93ce20fe5534e2974bb07561..247bc1123ee68be88cd459007da1bfd700b1a7b1 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -5105,6 +5105,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -5099,6 +5099,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,7 +21,7 @@ index 382127e4aa4bf85f8fe5342db987c81973618395..45a9a5211906040fd70477ca04b8fb35
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 165f6000cd9b572ddf0341b614a9e8fcf72cae14..3fe2ea96cfa0c920d4d0a3542f1b8457d5375f4e 100644
+index cef3171a99877d5feb8157c2be1952b5df112b86..757059c24b9f899452d41a873c31204bf9ce08db 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3586,6 +3586,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@ -53,7 +53,7 @@ index 165f6000cd9b572ddf0341b614a9e8fcf72cae14..3fe2ea96cfa0c920d4d0a3542f1b8457
     observer->DidOpenRequestedURL(new_contents_impl, opener, params.target_url,
                                   params.referrer.To<Referrer>(),
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 599059dd6d9098cd2deec39a5601ebe2bae6e8c7..c01a459f48960d1f9060ba2ce6e1cc2cda10dfce 100644
+index 239d572e58897dbcd00b201dcb8bbc73c93bc8a1..f76123851baf157e7c78bb8f1d0001ee58f4a293 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
@@ -292,6 +292,10 @@ struct CreateNewWindowParams {
@ -68,7 +68,7 @@ index 599059dd6d9098cd2deec39a5601ebe2bae6e8c7..c01a459f48960d1f9060ba2ce6e1cc2c
 
 // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 3a29578361516484febe20950c7321d661cda7e7..1c10e687a745b261cd57c045c2d7abfc5d1ae6e8 100644
+index 418501ecb95d6d30e812ed94ae42df7c70ad1c42..86690d067b3bf20aea497b28d522751f35341e31 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
@@ -543,6 +543,8 @@ bool ContentBrowserClient::CanCreateWindow(
@ -81,10 +81,10 @@ index 3a29578361516484febe20950c7321d661cda7e7..1c10e687a745b261cd57c045c2d7abfc
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index ce69e43769b267ba0e96a7006fa4352639b49a1e..e90958ad2c59e0ce54713af341ed7f69f8915564 100644
+index 482b60a82121e2ee3085ee7360eb858aee32f117..58e49fc7fb88a75c3216928b1969ad023a592cbf 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -153,6 +153,7 @@ class NetworkService;
+@@ -156,6 +156,7 @@ class NetworkService;
 class TrustedURLLoaderHeaderClient;
 }  // namespace mojom
 struct ResourceRequest;
@ -92,7 +92,7 @@ index ce69e43769b267ba0e96a7006fa4352639b49a1e..e90958ad2c59e0ce54713af341ed7f69
 }  // namespace network
 
 namespace sandbox {
-@@ -875,6 +876,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -878,6 +879,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@ -140,7 +140,7 @@ index dc7f3bc886e7130c66d98ae6de73c17db746cbe5..6197db3570c860f39f381370e1af37f8
   }
 
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index f0dd940d751d96264ac72005299bfeb9302f59da..af2e6b4b5f2844b3b9980fa1217c1a4d80bf36cb 100644
+index 2c9d816e1aff340615061e888cbbcd69300befcd..575116b9ec2c961102a1438e79d84c3759686c2b 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
@@ -1794,12 +1794,11 @@ bool Browser::IsWebContentsCreationOverridden(
@ -264,7 +264,7 @@ 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 bd74e5c793144ecc08f7594a448f7fda36699cd6..4b103f7d8597a1b54a44aeec5fe3a6bf585cc5a7 100644
+index 040da1016bdc8cd3f806bdc04d03f85d78c5aa24..c9d6f3afd6da113ef44d7511d41314bf1dcecf38 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3547,8 +3547,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@ -362,10 +362,10 @@ index a7f0b19a8ab9bac6f1315ebd715d8e1b134edfe1..cbe2912d4ab2d9015396bbddf7836e10
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index 26e369985a4c9d74a9cdb0b3f5a4fb54b362446b..49313fcbdb0087ae2760e2349d525e5db3d83226 100644
+index 9b8facc207cfc1c2c12bca902bad9becde46198d..0d76293d7c3cd2db0ab2bc2025449ca942148689 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -350,8 +350,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -352,8 +352,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@ -376,10 +376,10 @@ index 26e369985a4c9d74a9cdb0b3f5a4fb54b362446b..49313fcbdb0087ae2760e2349d525e5d
   // can catch bad client behavior while not interfering with normal operation.
   constexpr size_t kMaxPendingWebContentsCount = 10;
 diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index e9659cf47b84660351dbe3651d9b35551cfa0b54..43e9c896c0d963e45f4a84d68f3fd01d2c892e2f 100644
+index 1373c30b1f4eaf3697e545a8a287776fd015f6de..961b047e0fe49a2bae06fa9a8d635043a13f1f6f 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
-@@ -202,8 +202,7 @@ class FrameImpl : public fuchsia::web::Frame,
+@@ -213,8 +213,7 @@ class FrameImpl : public fuchsia::web::Frame,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
--- 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 8d975d91cfe395ba756bb72558a01358c5c580e5..00bcbab2d0aad81027a1c6e8781c446cde55ba8c 100644
+index ddcbcbc5b7b3211ed46edde3e2a3fb11864f8e76..0258629623b3bc098fae9aea1fa84f8db646bde8 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -6070,6 +6070,7 @@ static_library("browser") {
+@@ -6097,6 +6097,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
@ -261,7 +261,7 @@ index b85f1869b42d7b485bba5872d70da6c0d5f17d82..8f68b3c14c712bedaa987325a1799ffa
     switches::kDisableInProcessStackTraces,
     sandbox::policy::switches::kDisableSeccompFilterSandbox,
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 0501709a855b9fae82ab06c4e143b42058ddc12e..e0a457aab29acda134d1da9c798b5472c9bdb627 100644
+index 7dd54738714927a8d13ca29b758929a013843804..72b9ba4c827e8e778d1ed5d9e9b3ac76542db9e3 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
@@ -4,6 +4,7 @@
@ -280,7 +280,7 @@ index 0501709a855b9fae82ab06c4e143b42058ddc12e..e0a457aab29acda134d1da9c798b5472
 
 namespace blink {
 
-@@ -95,6 +97,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
+@@ -83,6 +85,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
 }
 
 gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
@ -292,7 +292,7 @@ index 0501709a855b9fae82ab06c4e143b42058ddc12e..e0a457aab29acda134d1da9c798b5472
   // TODO(ccameron): If we add support for uint8srgb as a pixel format, this
   // will need to take into account whether or not this texture will be sampled
   // in linear or nonlinear space.
-@@ -102,6 +109,11 @@ gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
+@@ -90,6 +97,11 @@ gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
 }
 
 gfx::ColorSpace CanvasColorParams::GetStorageGfxColorSpace() const {
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@ -6,7 +6,7 @@ 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 47b6310b96198f6c759026cda28f782fd0431430..be8c3574a0a064e1476bdcd0317ddb2539e19e42 100644
+index a96abfa0a50cbbdedd82ea8c884c3c8bf1ab3fc3..87ee42a34b4121eddda2765953f51ac65d5d03b8 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -484,7 +484,11 @@
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@ -6,10 +6,10 @@ 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 bf546bdc9b79f4dd126850a49865923178c0813f..8cd93fb2a795fe3b5158fe7f9446c570859aeb7b 100644
+index 19f90228473a1718b9f604c05d67193868aecf98..0ef45f3c85e048aadabfaf02ab01dcc296861e87 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -676,6 +676,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -667,6 +667,9 @@ void RenderWidgetHostImpl::WasHidden() {
   if (is_hidden_)
     return;
 
@ -20,10 +20,10 @@ index bf546bdc9b79f4dd126850a49865923178c0813f..8cd93fb2a795fe3b5158fe7f9446c570
       blink::mojom::PointerLockResult::kWrongDocument);
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 770605ddbb4b15545144eb145d7421f3004123f6..7be03ae10815e4b811a87350966e294748822188 100644
+index aef170316a5e01b77edae488096d5154d8f3afec..23051aa5656ed1e8c3c1b86993344d01bb14421c 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -173,6 +173,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -172,6 +172,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   // RenderWidgetHostImpl.
   static RenderWidgetHostImpl* From(RenderWidgetHost* rwh);
 
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@ -21,10 +21,10 @@ index da2aeb2f2da84fe47d5cc7d721f8d3dade0c0972..4ddad9065782fad5927bc0481ad77201
 #endif
   std::shared_ptr<v8::TaskRunner> GetForegroundTaskRunner(
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 432c4aa82775a5faf53dfbc9c0e7036b753b3304..dc7097f466abc119839666e0a95db63a75a39e00 100644
+index 68415704fd7b35677239ac93ca1830d05ec2de8f..b79aa33777dac074731a24926554a1f040de885f 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -454,6 +454,10 @@ v8::PageAllocator* V8Platform::GetPageAllocator() {
+@@ -453,6 +453,10 @@ v8::PageAllocator* V8Platform::GetPageAllocator() {
   return g_page_allocator.Pointer();
 }
 
--- 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 daec1d32ea084aadc86a455daaf5466a5a274554..c07b3ac39d4e5ee94dbb10b281cc95c32683f213 100644
+index fdd3ad94524e78678a9947b91a7fe09a5bf32442..a574d600850d91379397ee43b33d0443b48040e2 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
@@ -1104,6 +1104,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
@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index e74ad6694c23ccf7440de4fa158b002e510fab5b..08cc326ca4a06575902359d16b60b9a897b2c581 100644
+index d50a4f5c0c1bbb2a82748bca4d363295c2af2e99..a4e7620dbed70a6ecc4751766f7f25bb202a4cad 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -586,6 +586,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@ -22,10 +22,10 @@ index e74ad6694c23ccf7440de4fa158b002e510fab5b..08cc326ca4a06575902359d16b60b9a8
   return is_active();
 }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 1b27f1ed91696dd0f644a9cea3fb058645245e79..7b7e4e0bdcc6a39be398a495f63d5e325abe1982 100644
+index 98cc9b0a93b6618199dffbf2ee4bfdd599e52831..4e350d0e41502284d3c55d5469562a03748d53c2 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -132,6 +132,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+@@ -131,6 +131,7 @@ class CONTENT_EXPORT RenderViewHostImpl
   SiteInstanceImpl* GetSiteInstance() override;
   bool IsRenderViewLive() override;
 
@ -34,10 +34,10 @@ index 1b27f1ed91696dd0f644a9cea3fb058645245e79..7b7e4e0bdcc6a39be398a495f63d5e32
   void SendRendererPreferencesToRenderer(
       const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 2f2375ca2889ae2b91b6aca7842456663fcddee0..3ab9fb51fd0b9a73d338236a86a7ec05d16f4fe7 100644
+index 4c082605daf6841205f51789c1df329cc10ce57e..f450523c978c7603af4358fb928c6be70fc3130a 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
-@@ -91,6 +91,9 @@ class CONTENT_EXPORT RenderViewHost : public IPC::Sender {
+@@ -91,6 +91,9 @@ class CONTENT_EXPORT RenderViewHost {
   // Returns true if the RenderView is active and has not crashed.
   virtual bool IsRenderViewLive() = 0;
 
@ -85,10 +85,10 @@ index 500f7da6e87a1ce7a822b88d56cef8c09c7fccc3..19f4e08ffe5b95e33d4d17b36ef89c96
   // Visibility -----------------------------------------------------------
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 7a6c4b5ad56e4cf8177935ac07e5b8ca14af3ca1..83b7030856137a980f325071e6637b52e5cdf610 100644
+index 1ae768c752dd11bdb70c9e4ac1e3f17f36d9261e..10d125e34a25ddbfeaa1c06d16fcf794f1a26a84 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3614,6 +3614,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3603,6 +3603,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
   return GetPage()->GetPageScheduler();
 }
 
@ -102,7 +102,7 @@ index 7a6c4b5ad56e4cf8177935ac07e5b8ca14af3ca1..83b7030856137a980f325071e6637b52
 void WebViewImpl::SetVisibilityState(
     mojom::blink::PageVisibilityState visibility_state,
     bool is_initial_state) {
-@@ -3624,7 +3631,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3613,7 +3620,8 @@ void WebViewImpl::SetVisibilityState(
   }
   GetPage()->SetVisibilityState(visibility_state, is_initial_state);
   GetPage()->GetPageScheduler()->SetPageVisible(
@ -113,7 +113,7 @@ index 7a6c4b5ad56e4cf8177935ac07e5b8ca14af3ca1..83b7030856137a980f325071e6637b52
 
 mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 9b117076cac31255d96afa2bc202ec6f377c6bad..f9bfafd9effd1ff0c559d5b549a23318aef7a199 100644
+index 165699ca8d922bb17f846bfe5da844fce88503a5..df9d15a26e4bc1e92e643294db9ad366e2ff8331 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
@@ -352,6 +352,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -124,7 +124,7 @@ index 9b117076cac31255d96afa2bc202ec6f377c6bad..f9bfafd9effd1ff0c559d5b549a23318
   void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                           bool is_initial_state) override;
   mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -761,11 +762,18 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -760,11 +761,18 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   bool should_dispatch_first_layout_after_finished_parsing_ = false;
   bool should_dispatch_first_layout_after_finished_loading_ = false;
 
--- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
+++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced
 to true as then Chromiums assumptions around processes become correct.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3fe2ea96cfa0c920d4d0a3542f1b8457d5375f4e..0d0c5b88edbee1e8d9e5cf93811038fd65311a31 100644
+index 757059c24b9f899452d41a873c31204bf9ce08db..c80e520aabeb18420d4f2e5d621bf005b30c62c9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3008,11 +3008,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@ -106,10 +106,10 @@ index 5ea4a6cbcfdc462783e248293b7c0633812fcd3c..fc6fe28372a1f6cf67db18b76011da20
     READY_TO_COMMIT,
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index af2a0a2e5559f3ed58a9c4a74885f74e7779f8a0..229e33b7baed57fb65549dd22a0371289e3847c5 100644
+index 91ce535f20f8b216094c0bd6d7e8b2e572a425fa..8e4f59ac7056918f3d214e18d6828faced127fd7 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -2631,6 +2631,16 @@ scoped_refptr<SiteInstance>
+@@ -2630,6 +2630,16 @@ scoped_refptr<SiteInstance>
 RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
     NavigationRequest* request,
     std::string* reason) {
@ -126,7 +126,7 @@ index af2a0a2e5559f3ed58a9c4a74885f74e7779f8a0..229e33b7baed57fb65549dd22a037128
   SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
 
   // All children of MHTML documents must be MHTML documents. They all live in
-@@ -2658,10 +2668,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2657,10 +2667,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
   //
   // TODO(clamy): We should also consider as a candidate SiteInstance the
   // speculative SiteInstance that was computed on redirects.
@ -191,7 +191,7 @@ index af2a0a2e5559f3ed58a9c4a74885f74e7779f8a0..229e33b7baed57fb65549dd22a037128
 
   // Account for renderer-initiated reload as well.
   // Needed as a workaround for https://crbug.com/1045524, remove it when it is
-@@ -2700,6 +2760,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2699,6 +2759,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
     request->ResetStateForSiteInstanceChange();
   }
 
@ -217,7 +217,7 @@ index 814cc90ee58f0606bb41b3703b17e92602e84813..dfa649b86a683005a4c59863034e986d
     const GURL& url) {
   return GetRelatedSiteInstanceImpl(
 diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
-index 2c215c8761f202d7bd29e14693dcbf7596a0b89b..d613c1ac74c2c6a4560bfecd2c79352a36b229ba 100644
+index d48247b164fad63c2736dfd94d29883ae1a49d52..e6797cd70bd16c58caabd4e6bde38b9089946d79 100644
 --- a/content/browser/site_instance_impl.h
 +++ b/content/browser/site_instance_impl.h
@@ -321,6 +321,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
@ -229,7 +229,7 @@ index 2c215c8761f202d7bd29e14693dcbf7596a0b89b..d613c1ac74c2c6a4560bfecd2c79352a
   size_t GetRelatedActiveContentsCount() override;
   bool RequiresDedicatedProcess() override;
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 1c10e687a745b261cd57c045c2d7abfc5d1ae6e8..1d6c523c8d3a59fe3b35e8ec765f69a68cc873a1 100644
+index 86690d067b3bf20aea497b28d522751f35341e31..2c52e14e747e9d49ff94583d7c29c86c2f755bb2 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
@@ -64,6 +64,21 @@
@ -255,10 +255,10 @@ index 1c10e687a745b261cd57c045c2d7abfc5d1ae6e8..1d6c523c8d3a59fe3b35e8ec765f69a6
     const MainFunctionParams& parameters) {
   return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index e90958ad2c59e0ce54713af341ed7f69f8915564..9e2443720e0532281a7a5970a15ac9639cf545f2 100644
+index 58e49fc7fb88a75c3216928b1969ad023a592cbf..bedeae4431abdce5c6387c7ab879f8174fc86ec8 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -252,8 +252,45 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -255,8 +255,45 @@ class CONTENT_EXPORT ContentBrowserClient {
   using IsClipboardPasteAllowedCallback =
       base::OnceCallback<void(ClipboardPasteAllowed)>;
 
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.

 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index cb06259b198c2b3a2017be1e6607e48db7862fed..7b570132e353577720665156a6d949b98ac1b38f 100644
+index 11d6b8aca7ee16b1983dd93515e915930f699e68..3b3d6343a9163342bf454a5bc5cf104a36b97564 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
@@ -678,6 +678,11 @@
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@ -90,10 +90,10 @@ 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 b6da376a59b9d7391215fd2bca31476a550a311f..0d32be1e22fbb1aef242ba2a581434d51b6fd730 100644
+index c4aba106149c5da51049ecd9748a4be4e5fbebe2..02a3b789f46a5fc5fa3fbc3ea0e8ee3c4e548c1f 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;
+@@ -46,7 +46,9 @@ class ScopedPasswordInputEnabler;
 
 @protocol RenderWidgetHostViewMacDelegate;
 
@ -103,7 +103,7 @@ index b6da376a59b9d7391215fd2bca31476a550a311f..0d32be1e22fbb1aef242ba2a581434d5
 @class RenderWidgetHostViewCocoa;
 
 namespace content {
-@@ -649,10 +651,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -644,10 +646,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // EnsureSurfaceSynchronizedForWebTest().
   uint32_t latest_capture_sequence_number_ = 0u;
 
@ -117,7 +117,7 @@ index b6da376a59b9d7391215fd2bca31476a550a311f..0d32be1e22fbb1aef242ba2a581434d5
   // 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 27a102ae11c2b18404de92d3dd895c4ac6bcb7f4..47b6310b96198f6c759026cda28f782fd0431430 100644
+index 9b6a07b8af232dc8667a1ff3ad8b9567a73ffee9..a96abfa0a50cbbdedd82ea8c884c3c8bf1ab3fc3 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -234,8 +234,10 @@
@ -131,7 +131,7 @@ index 27a102ae11c2b18404de92d3dd895c4ac6bcb7f4..47b6310b96198f6c759026cda28f782f
 
   // Disconnect from the previous bridge (this will have the effect of
   // destroying the associated bridge), and close the receiver (to allow it
-@@ -1400,8 +1402,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1393,8 +1395,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 
 gfx::NativeViewAccessible
 RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -142,7 +142,7 @@ index 27a102ae11c2b18404de92d3dd895c4ac6bcb7f4..47b6310b96198f6c759026cda28f782f
   return [GetInProcessNSView() window];
 }
 
-@@ -1433,9 +1437,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1426,9 +1430,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 }
 
 void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -154,7 +154,7 @@ index 27a102ae11c2b18404de92d3dd895c4ac6bcb7f4..47b6310b96198f6c759026cda28f782f
 }
 
 bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -1922,12 +1928,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1915,12 +1921,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
 
 void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
     const std::vector<uint8_t>& window_token) {
@ -170,7 +170,7 @@ index 27a102ae11c2b18404de92d3dd895c4ac6bcb7f4..47b6310b96198f6c759026cda28f782f
 
 ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index df0db2e2e26acd83223d687f69b6b328f06ef6c2..e3b363d57c690c7eaa8cf8f5c0200ba616b70e89 100644
+index 21f6ba79800f318a1930f1fad8bf26d73fecfe65..398c1204eaa0d7ccd2672825f8f4b4536934f417 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
@@ -311,6 +311,13 @@ component("base") {
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@ -7,10 +7,10 @@ Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
 excluded for people who want to submit their apps to the Mac App store.

 diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
-index 77bc8739d38464676c6e649dee7abfadb2dbe551..5ac9fc521cce68020ae138bde741e3b8aed2152d 100644
+index ee70a953e7689e64125cba5657452ce02f627701..e1e184745d4e8a702553008315c5ea3548b89e9f 100644
 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
 +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
-@@ -303,7 +303,7 @@ OptionalNSObject InvokeAttributeFor(
+@@ -301,7 +301,7 @@ OptionalNSObject InvokeAttributeFor(
       0 == strcmp([value objCType], @encode(NSRange))) {
     return PopulateRange([value rangeValue]);
   }
@ -19,7 +19,7 @@ index 77bc8739d38464676c6e649dee7abfadb2dbe551..5ac9fc521cce68020ae138bde741e3b8
   // AXTextMarker
   if (content::IsAXTextMarker(value)) {
     return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(),
-@@ -314,6 +314,7 @@ OptionalNSObject InvokeAttributeFor(
+@@ -312,6 +312,7 @@ OptionalNSObject InvokeAttributeFor(
   if (content::IsAXTextMarkerRange(value)) {
     return PopulateTextMarkerRange(value, line_indexer);
   }
@ -27,7 +27,7 @@ index 77bc8739d38464676c6e649dee7abfadb2dbe551..5ac9fc521cce68020ae138bde741e3b8
 
   // AXValue
   if (CFGetTypeID(value) == AXValueGetTypeID()) {
-@@ -424,7 +425,7 @@ OptionalNSObject InvokeAttributeFor(
+@@ -422,7 +423,7 @@ OptionalNSObject InvokeAttributeFor(
                     kConstValuePrefix + affinity);
   return set;
 }
@ -36,7 +36,7 @@ index 77bc8739d38464676c6e649dee7abfadb2dbe551..5ac9fc521cce68020ae138bde741e3b8
 base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
     id object,
     const LineIndexer* line_indexer) const {
-@@ -438,7 +439,7 @@ OptionalNSObject InvokeAttributeFor(
+@@ -436,7 +437,7 @@ OptionalNSObject InvokeAttributeFor(
   dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexer));
   return dict;
 }
@ -125,10 +125,10 @@ index a5324dfd0c8a6bcd8fb7f89ce30d1f1b1ade0304..02564098d67f044cef54d285772a449d
 // is concerned.
 @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42050baab8 100644
+index 736d036afcdb0d3e0d02c948c1c71724b50b5237..47d453cff01286242dc72c956fe57ab9bb014db2 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
-@@ -208,6 +208,7 @@
+@@ -209,6 +209,7 @@
 NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute =
     @"AXLengthForTextMarkerRange";
 
@ -136,7 +136,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 // Private attributes that can be used for testing text markers, e.g. in dump
 // tree tests.
 NSString* const
-@@ -219,6 +220,7 @@
+@@ -220,6 +221,7 @@
 NSString* const
     NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute =
         @"AXTextMarkerNodeDebugDescription";
@ -144,7 +144,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 // Other private attributes.
 NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute =
-@@ -242,6 +244,7 @@
+@@ -243,6 +245,7 @@
 // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
 const int kAXResultsLimitNoLimit = -1;
 
@ -152,7 +152,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 extern "C" {
 
 // The following are private accessibility APIs required for cursor navigation
-@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range,
+@@ -471,6 +474,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range,
   AddMisspelledTextAttributes(ax_range, attributed_text);
   return attributed_text;
 }
@ -160,7 +160,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 // Returns an autoreleased copy of the AXNodeData's attribute.
 NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
-@@ -741,6 +745,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
+@@ -742,6 +746,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
 #define NSAccessibilityLanguageAttribute @"AXLanguage"
 #endif
 
@ -168,7 +168,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 bool content::IsAXTextMarker(id object) {
   if (object == nil)
     return false;
-@@ -784,6 +789,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
+@@ -785,6 +790,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
       kCFAllocatorDefault, anchor_textmarker, focus_textmarker);
   return [static_cast<id>(cf_marker_range) autorelease];
 }
@ -176,7 +176,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 @implementation BrowserAccessibilityCocoa
 
-@@ -821,7 +827,9 @@ + (void)initialize {
+@@ -823,7 +829,9 @@ + (void)initialize {
       {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
       {NSAccessibilityElementBusyAttribute, @"elementBusy"},
       {NSAccessibilityEnabledAttribute, @"enabled"},
@ -186,7 +186,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
       {NSAccessibilityExpandedAttribute, @"expanded"},
       {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
       {NSAccessibilityFocusedAttribute, @"focused"},
-@@ -833,8 +841,10 @@ + (void)initialize {
+@@ -835,8 +843,10 @@ + (void)initialize {
       {NSAccessibilityHighestEditableAncestorAttribute,
        @"highestEditableAncestor"},
       {NSAccessibilityIndexAttribute, @"index"},
@ -197,7 +197,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
       {NSAccessibilityInvalidAttribute, @"invalid"},
       {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"},
       {NSAccessibilityLanguageAttribute, @"language"},
-@@ -856,13 +866,17 @@ + (void)initialize {
+@@ -858,13 +868,17 @@ + (void)initialize {
       {NSAccessibilityRowsAttribute, @"rows"},
       // TODO(aboxhall): expose
       // NSAccessibilityServesAsTitleForUIElementsAttribute
@ -215,7 +215,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
       {NSAccessibilitySizeAttribute, @"size"},
       {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
       {NSAccessibilitySubroleAttribute, @"subrole"},
-@@ -1330,6 +1344,7 @@ - (NSNumber*)enabled {
+@@ -1362,6 +1376,7 @@ - (NSNumber*)enabled {
                                   ax::mojom::Restriction::kDisabled];
 }
 
@ -223,7 +223,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 // Returns a text marker that points to the last character in the document that
 // can be selected with VoiceOver.
 - (id)endTextMarker {
-@@ -1340,6 +1355,7 @@ - (id)endTextMarker {
+@@ -1372,6 +1387,7 @@ - (id)endTextMarker {
   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
 }
@ -231,7 +231,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 - (NSNumber*)expanded {
   if (![self instanceActive])
-@@ -1542,6 +1558,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
+@@ -1574,6 +1590,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
   return false;
 }
 
@ -239,7 +239,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 - (NSNumber*)insertionPointLineNumber {
   if (![self instanceActive])
     return nil;
-@@ -1564,6 +1581,7 @@ - (NSNumber*)insertionPointLineNumber {
+@@ -1596,6 +1613,7 @@ - (NSNumber*)insertionPointLineNumber {
                        caretPosition->AsTextPosition()->text_offset());
   return @(std::distance(lineBreaks.begin(), iterator));
 }
@ -247,7 +247,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 // Returns whether or not this node should be ignored in the
 // accessibility tree.
-@@ -1922,8 +1940,12 @@ - (BOOL)shouldExposeTitleUIElement {
+@@ -1954,8 +1972,12 @@ - (BOOL)shouldExposeTitleUIElement {
       return content::AXTextEdit(newValue, base::string16(), nil);
     }
   }
@ -260,7 +260,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 }
 
 - (BOOL)instanceActive {
-@@ -2253,6 +2275,7 @@ - (NSArray*)selectedChildren {
+@@ -2285,6 +2307,7 @@ - (NSArray*)selectedChildren {
   return ret;
 }
 
@ -268,7 +268,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 - (NSString*)selectedText {
   if (![self instanceActive])
     return nil;
-@@ -2264,11 +2287,13 @@ - (NSString*)selectedText {
+@@ -2296,11 +2319,13 @@ - (NSString*)selectedText {
     return nil;
   return base::SysUTF16ToNSString(range.GetText());
 }
@ -282,7 +282,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 - (NSValue*)selectedTextRange {
   if (![self instanceActive])
     return nil;
-@@ -2289,7 +2314,9 @@ - (NSValue*)selectedTextRange {
+@@ -2321,7 +2346,9 @@ - (NSValue*)selectedTextRange {
   int selLength = range.GetText().length();
   return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
 }
@ -292,7 +292,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 - (id)selectedTextMarkerRange {
   if (![self instanceActive])
     return nil;
-@@ -2297,6 +2324,7 @@ - (id)selectedTextMarkerRange {
+@@ -2329,6 +2356,7 @@ - (id)selectedTextMarkerRange {
   // words correctly.
   return CreateTextMarkerRange(GetSelectedRange(*_owner).AsBackwardRange());
 }
@ -300,7 +300,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 - (NSValue*)size {
   if (![self instanceActive])
-@@ -2329,6 +2357,7 @@ - (NSString*)sortDirection {
+@@ -2361,6 +2389,7 @@ - (NSString*)sortDirection {
   return nil;
 }
 
@ -308,7 +308,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 // Returns a text marker that points to the first character in the document that
 // can be selected with VoiceOver.
 - (id)startTextMarker {
-@@ -2339,6 +2368,7 @@ - (id)startTextMarker {
+@@ -2371,6 +2400,7 @@ - (id)startTextMarker {
   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
 }
@ -316,7 +316,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 // Returns a subrole based upon the role.
 - (NSString*)subrole {
-@@ -2665,11 +2695,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
+@@ -2697,11 +2727,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
   NSMutableAttributedString* attributedInnerText =
       [[[NSMutableAttributedString alloc]
           initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
@ -330,7 +330,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
   return [attributedInnerText attributedSubstringFromRange:range];
 }
-@@ -2782,9 +2814,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2814,9 +2846,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
       return ToBrowserAccessibilityCocoa(cell);
   }
 
@ -342,7 +342,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
     BrowserAccessibilityPositionInstance position =
         CreatePositionFromTextMarker(parameter);
     if (!position->IsNullPosition())
-@@ -3097,6 +3128,7 @@ AXPlatformRange range(std::move(lineStartPosition),
+@@ -3129,6 +3160,7 @@ AXPlatformRange range(std::move(lineStartPosition),
 
     return CreateTextMarker(root->CreatePositionAt(index));
   }
@ -350,7 +350,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
   if ([attribute isEqualToString:
                      NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -3127,6 +3159,7 @@ AXPlatformRange range(std::move(lineStartPosition),
+@@ -3159,6 +3191,7 @@ AXPlatformRange range(std::move(lineStartPosition),
     return nil;
   }
 
@ -358,7 +358,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
   if ([attribute
           isEqualToString:
               NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-@@ -3241,6 +3274,7 @@ AXPlatformRange range(std::move(lineStartPosition),
+@@ -3273,6 +3306,7 @@ AXPlatformRange range(std::move(lineStartPosition),
 
     return @(child->GetIndexInParent());
   }
@ -366,7 +366,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
   return nil;
 }
-@@ -3786,6 +3820,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3822,6 +3856,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
         AXPlatformRange(_owner->CreatePositionAt(range.location),
                         _owner->CreatePositionAt(NSMaxRange(range))));
   }
@ -374,7 +374,7 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
   if ([attribute
           isEqualToString:NSAccessibilitySelectedTextMarkerRangeAttribute]) {
     AXPlatformRange range = CreateRangeFromTextMarkerRange(value);
-@@ -3795,6 +3830,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3831,6 +3866,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
     manager->SetSelection(AXPlatformRange(range.anchor()->AsLeafTextPosition(),
                                           range.focus()->AsLeafTextPosition()));
   }
@ -383,10 +383,10 @@ index d792b573258714648c8ce66bedc2fbb4e7417028..2fed4257026236b22eba912e95284c42
 
 // Returns the deepest accessibility child that should not be ignored.
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index 8252732604b324e2abf970af4082b521ae896b85..34d5905aa9e68b915fda1eb5ef3b14df14c74968 100644
+index 62c3914ca7899466ce1c2cfa69ba50917e7d299e..122e517ddcb3944847fc289eb45c87d5fb156afc 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-@@ -549,6 +549,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -554,6 +554,7 @@ void PostAnnouncementNotification(NSString* announcement) {
       [user_info setObject:native_focus_object
                     forKey:NSAccessibilityTextChangeElement];
 
@ -394,7 +394,7 @@ index 8252732604b324e2abf970af4082b521ae896b85..34d5905aa9e68b915fda1eb5ef3b14df
       id selected_text = [native_focus_object selectedTextMarkerRange];
       if (selected_text) {
         NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-@@ -556,6 +557,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -561,6 +562,7 @@ void PostAnnouncementNotification(NSString* announcement) {
         [user_info setObject:selected_text
                       forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
       }
--- 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 3773583bedd00e94e86c172c4a110db3e4e038d5..daec1d32ea084aadc86a455daaf5466a5a274554 100644
+index db0ecdf918407a9b5b4d73f07edcfe069394c50f..fdd3ad94524e78678a9947b91a7fe09a5bf32442 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
@@ -115,6 +115,11 @@
@ -116,7 +116,7 @@ index 3773583bedd00e94e86c172c4a110db3e4e038d5..daec1d32ea084aadc86a455daaf5466a
 void NetworkContext::CreateURLLoaderFactory(
     mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
     mojom::URLLoaderFactoryParamsPtr params) {
-@@ -1851,8 +1936,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -1854,8 +1939,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          "NetworkContext should pass CertVerifierServiceRemoteParams.";
 
   std::unique_ptr<net::CertVerifier> cert_verifier;
@ -127,7 +127,7 @@ index 3773583bedd00e94e86c172c4a110db3e4e038d5..daec1d32ea084aadc86a455daaf5466a
   } else {
     if (params_->cert_verifier_params &&
         params_->cert_verifier_params->is_remote_params()) {
-@@ -1880,14 +1966,14 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -1883,14 +1969,14 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         cert_net_fetcher_ =
             base::MakeRefCounted<net::CertNetFetcherURLRequest>();
 
@ -145,7 +145,7 @@ index 3773583bedd00e94e86c172c4a110db3e4e038d5..daec1d32ea084aadc86a455daaf5466a
 
 #if BUILDFLAG(IS_ASH)
     cert_verifier_with_trust_anchors_ =
-@@ -1896,13 +1982,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -1899,13 +1985,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
     UpdateAdditionalCertificates(
         std::move(params_->initial_additional_certificates));
     cert_verifier_with_trust_anchors_->InitializeOnIOThread(
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@ -30,10 +30,10 @@ index a8cc695c4c1c1d2d7e3274a2b628894997de5fe8..a7ba417835f217391fa300f41c7fbdc0
   // 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 8cd93fb2a795fe3b5158fe7f9446c570859aeb7b..89428b65e2bf6944018f8520a2910b3d6ba16241 100644
+index 0ef45f3c85e048aadabfaf02ab01dcc296861e87..03eacce5081fd93763ba5bdf0f9b67a3c4e6dd29 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -1849,6 +1849,8 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& unsafe_cursor) {
+@@ -1840,6 +1840,8 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& unsafe_cursor) {
 
   if (view_)
     view_->UpdateCursor(WebCursor(cursor));
@ -43,7 +43,7 @@ index 8cd93fb2a795fe3b5158fe7f9446c570859aeb7b..89428b65e2bf6944018f8520a2910b3d
 
 void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index f2cbb7de01a8cca10103ed2795faa551a31b2883..bd74e5c793144ecc08f7594a448f7fda36699cd6 100644
+index 5f9090148230c5f941b6200f61f7a8adc1554346..040da1016bdc8cd3f806bdc04d03f85d78c5aa24 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4129,6 +4129,12 @@ bool WebContentsImpl::OnUpdateDragCursor() {
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).

 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index f721f1aff4781fa5936010dfb5b0c97587e81c05..7dd531f3d01590687ec14a013bb67503ce3347b0 100644
+index c0dfc37280e6161f5396bf10184fe9f5ceca1a4f..eead20c2b78cfdc598da3fefb422e036d2a4d7aa 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1448,7 +1448,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1449,7 +1449,7 @@ if (is_chrome_branded && !is_android) {
   }
 }
 
@ -64,7 +64,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..7dd531f3d01590687ec14a013bb67503
   chrome_paks("packed_resources") {
     if (is_mac) {
       output_dir = "$root_gen_dir/repack"
-@@ -1468,6 +1468,12 @@ if (!is_android) {
+@@ -1469,6 +1469,12 @@ if (!is_android) {
   }
 }
 
--- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
+++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
@ -92,10 +92,10 @@ index c311fd6e4094c56698575c492042644fc5bccf28..1337b1acd88a6e7fbffb23a0ca1f03c5
   // |url|. If the function returns a valid |new_url|, the request must be
   // updated to use it. The |force_ignore_site_for_cookies| output parameter
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 4f0e7563d263569f34eb336426a9bd4e28800032..25f786b85b41945a44380e5aedfd2b3fb3f68fc2 100644
+index d4210bec6eb6efb401b64dbd9d196891c7b4e551..1ffa87121d5f368dd1cad844406f8d16e8d9fc43 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -5570,6 +5570,23 @@ void RenderFrameImpl::BeginNavigation(
+@@ -5567,6 +5567,23 @@ void RenderFrameImpl::BeginNavigation(
     // we can do a per-frame check here rather than a process-wide check.
     bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
                        (enabled_bindings_ & kWebUIBindingsPolicyMask);
--- 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 a4240c7c75a3fabc1472bd0cebc6b5a5f0eb3b24..cf841406399aa12972640544ad2bb293181b9a4c 100644
+index 5a431390e7ab02a534a76e5624223c267c65af4c..ef2d6fbdf4f38c93afd30b57f4d7fd8ac63b1947 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
@@ -1293,7 +1293,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@ -9,7 +9,7 @@ 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 0d0c5b88edbee1e8d9e5cf93811038fd65311a31..f2cbb7de01a8cca10103ed2795faa551a31b2883 100644
+index c80e520aabeb18420d4f2e5d621bf005b30c62c9..5f9090148230c5f941b6200f61f7a8adc1554346 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2745,6 +2745,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@ -8,7 +8,7 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267

 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 88e0a39279d1ce0bbdc1dfb7ae4ea0745b2239d1..03ca97b8a80dd445e72bdca43edbc2bf2e735dba 100644
+index 00370b293fff5d50801aed1126c34cd12ea6326e..2ea1876d30ac62f3a1e063fd5599b99376b8b821 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -786,9 +786,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@ -451,7 +451,8 @@ void ElectronBrowserMainParts::PreMainMessageLoopRun() {
  auto* command_line = base::CommandLine::ForCurrentProcess();
  if (command_line->HasSwitch(switches::kRemoteDebuggingPipe)) {
    // --remote-debugging-pipe
-    content::DevToolsAgentHost::StartRemoteDebuggingPipeHandler();
+    content::DevToolsAgentHost::StartRemoteDebuggingPipeHandler(
+        base::OnceClosure());
  } else if (command_line->HasSwitch(switches::kRemoteDebuggingPort)) {
    // --remote-debugging-port
    DevToolsManagerDelegate::StartHttpHandler();
--- a/shell/browser/net/proxying_websocket.cc
+++ b/shell/browser/net/proxying_websocket.cc
@ -117,6 +117,10 @@ void ProxyingWebSocket::ContinueToHeadersReceived() {
  OnHeadersReceivedComplete(net::OK);
 }

+void ProxyingWebSocket::OnFailure(const std::string& message,
+                                  int32_t net_error,
+                                  int32_t response_code) {}
+
 void ProxyingWebSocket::OnConnectionEstablished(
    mojo::PendingRemote<network::mojom::WebSocket> websocket,
    mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,
--- a/shell/browser/net/proxying_websocket.h
+++ b/shell/browser/net/proxying_websocket.h
@ -70,6 +70,9 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
  // network::mojom::WebSocketHandshakeClient methods:
  void OnOpeningHandshakeStarted(
      network::mojom::WebSocketHandshakeRequestPtr request) override;
+  void OnFailure(const std::string& message,
+                 int32_t net_error,
+                 int32_t response_code) override;
  void OnConnectionEstablished(
      mojo::PendingRemote<network::mojom::WebSocket> websocket,
      mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,