chore: roll 74.0.3724.8

DEPS

@@ -10,7 +10,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '74.0.3718.2',
+    '74.0.3724.8',
   'node_version':
     '5e32b02e3c180c9997d60fe85042d335b6d9a588',
 

patches/common/chromium/.patches

@@ -69,9 +69,6 @@ disable_color_correct_rendering.patch
 disable_time_ticks_dcheck.patch
 autofill_size_calculation.patch
 revert_build_swiftshader_for_arm32.patch
-fix_backup_includes_for_ptrace_get_thread_area_on_arm_arm64.patch
-color_chooser_mac.patch
-color_chooser_win.patch
 fix_disable_usage_of_abort_report_np_in_mas_builds.patch
 fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
 fix_disable_usage_of_setapplicationisdaemon_and.patch

patches/common/chromium/add_realloc.patch

@@ -39,7 +39,7 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index f8a93785435888f4d2d22976a2b7003cf5d14f15..9c2a95c611dace86620d07686f5d43dfe5a5b546 100644
+index 4a8ed5153449a668c810613fc384eb7952772db1..a426fb833c6b2ccc50f2738dab1764f0306a180f 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -650,6 +650,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {

patches/common/chromium/allow_webview_file_url.patch

@@ -6,10 +6,10 @@ Subject: allow_webview_file_url.patch
 Allow webview to load non-web URLs.
 
 diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
-index bd2d517223623ded88e0b15f601e473059895b83..a8c1de1ebc3022cb3644ea3375a83b6d266d1600 100644
+index f6d8cf0e1b7373498739d6821a4b6b2725cf3c5c..3144e81cdb79b0b235385701c2eb81b6b9017213 100644
 --- a/content/browser/loader/resource_dispatcher_host_impl.cc
 +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
-@@ -1439,6 +1439,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
+@@ -1536,6 +1536,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
        !policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
        !is_external_protocol;
  

patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch

@@ -5,10 +5,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
 
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index 859ee81f45d3afbc5c6e2541e845f91ec5fca046..110bb50ad96a6abb855e644acf29c591f0b5ab32 100644
+index 6575793a7df4eed2b1cc1cd59c559c591648c478..bf00aeb1df1dea4668a2d6645aefb578d1fc86e2 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-@@ -306,7 +306,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
+@@ -307,7 +307,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
    // document (which is implemented in WorkerMessagingProxy, and
    // m_contentSecurityPolicy should be left as nullptr to inherit the policy).
    if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

patches/common/chromium/blink_initialization_order.patch

@@ -10,10 +10,10 @@ to fix electron/electron#13787.  The backport landed in Chromium 67 but the
 DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index c4220bd6850f39628276cc353afbe20ec7376ec2..7c9466e5eb3597bdc47ecd544d560e5a2409bc8c 100644
+index ea4d47ef7ed58f2be638a6fbae7c12e1ee5b4c77..c02e5fcf72486600702a5ac39af2a13c1b255b4b 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -197,11 +197,10 @@ void LocalWindowProxy::Initialize() {
+@@ -202,11 +202,10 @@ void LocalWindowProxy::Initialize() {
                   GetFrame()->IsMainFrame());
      MainThreadDebugger::Instance()->ContextCreated(script_state_, GetFrame(),
                                                     origin);

patches/common/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ 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 95ce90f711a1d8817ae0930d79b11451b508ddd0..f37598cb954e0312f92b4b2f5454785d8badfc04 100644
+index d696925e6f5dae9ca6406a15766826ee8e42475c..f592b0e7fa3c32d66dd0247e1492a973a1583d59 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -401,10 +401,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -409,10 +409,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    CHECK(!view_ || !view_->IsAttached());
  
@@ -28,7 +28,7 @@ index 95ce90f711a1d8817ae0930d79b11451b508ddd0..f37598cb954e0312f92b4b2f5454785d
    if (!Client())
      return;
  
-@@ -422,6 +418,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -430,6 +426,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
    GetScriptController().ClearForClose();

patches/common/chromium/blink_world_context.patch

@@ -5,10 +5,10 @@ Subject: blink_world_context.patch
 
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 72fb1b51ded3b6e090b475641cefb1af4e3803c3..82b57892350adeb7f65ea17882f0b1b08090eebe 100644
+index fa0fca68d181f6783bb88e99f42697d5efbd3a49..93630884c3a3a4441645d76742796322f39653c3 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -344,6 +344,9 @@ class WebLocalFrame : public WebFrame {
+@@ -348,6 +348,9 @@ class WebLocalFrame : public WebFrame {
    // be calling this API.
    virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
  
@@ -19,10 +19,10 @@ index 72fb1b51ded3b6e090b475641cefb1af4e3803c3..82b57892350adeb7f65ea17882f0b1b0
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index c059f16582ecd6310bf523bc315b6107c69c34f8..b0dc3cde086ad53e5432406c2ce44cc5693b9310 100644
+index 699af61cbfc80a0e88ccf692c0a4eccca12b0c8a..68fbdd861dc991bf1ab91775336e7a9f6889a0a7 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -889,6 +889,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -891,6 +891,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
  
@@ -37,10 +37,10 @@ index c059f16582ecd6310bf523bc315b6107c69c34f8..b0dc3cde086ad53e5432406c2ce44cc5
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index 9074fabf2d2fb199cbd3f6d73f11ff8c9239a847..24ab8fc628815d94d420f9ec7f9b979010831dea 100644
+index 1d365801c7094a1ea091b1ecfea7ab3d3527bcec..b0df9b3ca6d33fd187a3cbcd750603e4a7db98d3 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -147,6 +147,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -148,6 +148,8 @@ class CORE_EXPORT WebLocalFrameImpl final
        int argc,
        v8::Local<v8::Value> argv[]) override;
    v8::Local<v8::Context> MainWorldScriptContext() const override;

patches/common/chromium/browser_compositor_mac.patch

@@ -29,7 +29,7 @@ diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/cont
 index 0817b4eca4f4e6f7f5d250589c1e4dbcc068237c..dcc2340e59771e8d73de7e97fa2371d8bec7b149 100644
 --- a/content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
-@@ -79,6 +79,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
+@@ -79,6 +79,12 @@
    DCHECK_EQ(1u, num_erased);
  }
  

patches/common/chromium/can_create_window.patch

@@ -5,10 +5,10 @@ Subject: can_create_window.patch
 
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 3d4741bff391e2596730665c98986e5cc0773a4c..024651b9ec3b90d38607cffe7b73d8d53901fa52 100644
+index ca7881b3b3cd06b9dc89abc477d560a288fe5423..69081399bf0f746a0fd447ac5f8ec360664195ad 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -3631,6 +3631,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -3654,6 +3654,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,
@@ -32,7 +32,7 @@ index f660470b2c612f89a3ad9f0ada4ab13710705b57..45c38198e8fcc44d71ef9440e38d301f
  
  // 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 2426808759bfa7e0eabb2e9de6925bf59902055a..09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126 100644
+index b37de5fbf84131cdcb2ee073e746fb18f0f1fc35..b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -501,6 +501,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -45,7 +45,7 @@ index 2426808759bfa7e0eabb2e9de6925bf59902055a..09a2a50fdbd76d24d547bf5e22f9a0a9
      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 8b47fdebe3efb1022a4602422dbffd39f983cfcc..a70f357b97da1a24b02e9a7b29504c63b2c780fb 100644
+index 7fc0a70f4e79544a9cc8dfcc1fa5f670261c4e56..72944bc96a2ec71be1b20fa68e7994445f225824 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -175,6 +175,7 @@ class RenderFrameHost;
@@ -66,7 +66,7 @@ index 8b47fdebe3efb1022a4602422dbffd39f983cfcc..a70f357b97da1a24b02e9a7b29504c63
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index bccdec835985e74b450a220969e5db744a812466..422601a02d5891c9f443869059885ce798c75384 100644
+index 91c52f9d202efd6232ac602e5dc847737695471d..b71bbc613bdd573546b2cfa89b98220a434169c5 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -76,6 +76,7 @@
@@ -87,10 +87,10 @@ index bccdec835985e74b450a220969e5db744a812466..422601a02d5891c9f443869059885ce7
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index 0d9cd73bbb34e1eee0bb2bbfed46e026779997e7..0e6e147b5068dd82a3dc00952f22676db4278195 100644
+index 9e738f90c516cfec18816a183f1a2ab615827307..7e04c82967e3458be32345e683af33b9abc5289e 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -298,6 +298,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -299,6 +299,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -100,7 +100,7 @@ index 0d9cd73bbb34e1eee0bb2bbfed46e026779997e7..0e6e147b5068dd82a3dc00952f22676d
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
-index ad388b224dc8dec395a9ea82c67ad4031851a2cc..d5cfe02d61dd28c49f4a5e2714f03cd4ebe9e119 100644
+index 1eeb9dafd62e163c7458352de31c62dbd1293f32..0d46e75cdf0a1ef573e733432a4613da850d6f4d 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.h
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.h
 @@ -67,6 +67,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {

patches/common/chromium/color_chooser_mac.patch

@@ -1,186 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benedek Heilig <benecene@gmail.com>
-Date: Thu, 21 Feb 2019 17:04:30 +0000
-Subject: fix a crash when using color chooser on macos
-
-Backports an upstream fix I made to the color chooser dialog on macos.
-This can be removed once that fix lands in a chromium version we use.
-Below is the original commit message:
-
-Fix crash when closing color chooser dialog on macos
-
-For some reason, closing the color chooser dialog caused a crash on
-macos. By using NSNotificationCenter instead of providing a delegate
-the crash goes away. I got the idea for this from the comment about the
-__target method already in the code.
-
-Change-Id: Ide35a455ff12decc9dd83b30c80b584ab376242b
-
-diff --git a/AUTHORS b/AUTHORS
-index 374b1a177f30d0c4b415d5c9c0fc4e4673414d39..436be8a093831020453285f0c476dcf9bd42fe8d 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -114,6 +114,7 @@ Ben Coe <bencoe@gmail.com>
- Ben Fiola <benfiola@gmail.com>
- Ben Karel <eschew@gmail.com>
- Ben Noordhuis <ben@strongloop.com>
-+Benedek Heilig <benecene@gmail.com>
- Benjamin Dupont <bedupont@cisco.com>
- Benjamin Jemlich <pcgod99@gmail.com>
- Bernard Cafarelli <voyageur@gentoo.org>
-diff --git a/chrome/browser/ui/cocoa/color_chooser_mac.h b/chrome/browser/ui/cocoa/color_chooser_mac.h
-index 511000dc7855938ceab31694149ddf9e2125e0e4..9dbcc9fe41786555f0fb16ac47c71ee8851c8dd5 100644
---- a/chrome/browser/ui/cocoa/color_chooser_mac.h
-+++ b/chrome/browser/ui/cocoa/color_chooser_mac.h
-@@ -15,7 +15,7 @@ class ColorChooserMac;
- 
- // A Listener class to act as a event target for NSColorPanel and send
- // the results to the C++ class, ColorChooserMac.
--@interface ColorPanelCocoa : NSObject<NSWindowDelegate> {
-+@interface ColorPanelCocoa : NSObject {
-  @protected
-   // We don't call DidChooseColor if the change wasn't caused by the user
-   // interacting with the panel.
-@@ -26,6 +26,8 @@ class ColorChooserMac;
- 
- - (id)initWithChooser:(ColorChooserMac*)chooser;
- 
-+- (void)windowWillClose:(NSNotification*)notification;
-+
- // Called from NSColorPanel.
- - (void)didChooseColor:(NSColorPanel*)panel;
- 
-@@ -45,7 +47,7 @@ class ColorChooserMac : public content::ColorChooser {
- 
-   // Called from ColorPanelCocoa.
-   void DidChooseColorInColorPanel(SkColor color);
--  void DidCloseColorPabel();
-+  void DidCloseColorPanel();
- 
-   // Set the color programmatically.
-   void SetSelectedColor(SkColor color) override;
-diff --git a/chrome/browser/ui/cocoa/color_chooser_mac.mm b/chrome/browser/ui/cocoa/color_chooser_mac.mm
-index bf47154f0a880f1c6143065e5c6d060f1df73765..e7cdab7a23d96345cc6e8ec578a8616d132b7d51 100644
---- a/chrome/browser/ui/cocoa/color_chooser_mac.mm
-+++ b/chrome/browser/ui/cocoa/color_chooser_mac.mm
-@@ -39,16 +39,18 @@ void ColorChooserMac::DidChooseColorInColorPanel(SkColor color) {
-     web_contents_->DidChooseColorInColorChooser(color);
- }
- 
--void ColorChooserMac::DidCloseColorPabel() {
-+void ColorChooserMac::DidCloseColorPanel() {
-   End();
- }
- 
- void ColorChooserMac::End() {
--  panel_.reset();
--  DCHECK(current_color_chooser_ == this);
--  current_color_chooser_ = NULL;
--  if (web_contents_)
-+  if (panel_) {
-+    panel_.reset();
-+    DCHECK(current_color_chooser_ == this);
-+    current_color_chooser_ = NULL;
-+    if (web_contents_)
-       web_contents_->DidEndColorChooser();
-+  }
- }
- 
- void ColorChooserMac::SetSelectedColor(SkColor color) {
-@@ -67,9 +69,14 @@ void ColorChooserMac::SetSelectedColor(SkColor color) {
-     chooser_ = chooser;
-     NSColorPanel* panel = [NSColorPanel sharedColorPanel];
-     [panel setShowsAlpha:NO];
--    [panel setDelegate:self];
-     [panel setTarget:self];
-     [panel setAction:@selector(didChooseColor:)];
-+
-+    [[NSNotificationCenter defaultCenter]
-+        addObserver:self
-+           selector:@selector(windowWillClose:)
-+               name:NSWindowWillCloseNotification
-+             object:panel];
-   }
-   return self;
- }
-@@ -82,19 +89,21 @@ void ColorChooserMac::SetSelectedColor(SkColor color) {
-   // the ColorPanelCocoa is still the target.
-   BOOL respondsToPrivateTargetMethod =
-       [panel respondsToSelector:@selector(__target)];
--
--  if ([panel delegate] == self ||
--      (respondsToPrivateTargetMethod && [panel __target] == self)) {
--    [panel setDelegate:nil];
-+  if (respondsToPrivateTargetMethod && [panel __target] == self) {
-     [panel setTarget:nil];
-     [panel setAction:nullptr];
-   }
- 
-+  [[NSNotificationCenter defaultCenter]
-+      removeObserver:self
-+                name:NSWindowWillCloseNotification
-+              object:panel];
-+
-   [super dealloc];
- }
- 
- - (void)windowWillClose:(NSNotification*)notification {
--  chooser_->DidCloseColorPabel();
-+  chooser_->DidCloseColorPanel();
-   nonUserChange_ = NO;
- }
- 
-diff --git a/chrome/browser/ui/cocoa/color_panel_cocoa_unittest.mm b/chrome/browser/ui/cocoa/color_panel_cocoa_unittest.mm
-index 83185ceb9bbd29bf38fce7f72c23f3a5b15ba6c8..823365fdfc0bceceeed6f5edc00b3462715a4751 100644
---- a/chrome/browser/ui/cocoa/color_panel_cocoa_unittest.mm
-+++ b/chrome/browser/ui/cocoa/color_panel_cocoa_unittest.mm
-@@ -28,28 +28,6 @@ class ColorPanelCocoaTest : public CocoaTest {
-   }
- };
- 
--TEST_F(ColorPanelCocoaTest, ClearTargetAndDelegateOnEnd) {
--  NSColorPanel* nscolor_panel = [NSColorPanel sharedColorPanel];
--  @autoreleasepool {
--    EXPECT_TRUE([nscolor_panel respondsToSelector:@selector(__target)]);
--
--    // Create a ColorPanelCocoa.
--    ColorChooserMac* color_chooser_mac =
--        ColorChooserMac::Open(nullptr, SK_ColorBLACK);
--
--    // Confirm the NSColorPanel's configuration by the ColorChooserMac's
--    // ColorPanelCocoa.
--    EXPECT_TRUE([nscolor_panel delegate]);
--    EXPECT_TRUE([nscolor_panel __target]);
--
--    // Release the ColorPanelCocoa and confirm it's no longer the NSColorPanel's
--    // target or delegate.
--    color_chooser_mac->End();
--  }
--  EXPECT_EQ([nscolor_panel delegate], nil);
--  EXPECT_EQ([nscolor_panel __target], nil);
--}
--
- TEST_F(ColorPanelCocoaTest, ClearTargetOnEnd) {
-   NSColorPanel* nscolor_panel = [NSColorPanel sharedColorPanel];
-   @autoreleasepool {
-@@ -61,19 +39,12 @@ TEST_F(ColorPanelCocoaTest, ClearTargetOnEnd) {
- 
-     // Confirm the NSColorPanel's configuration by the ColorChooserMac's
-     // ColorPanelCocoa.
--    EXPECT_TRUE([nscolor_panel delegate]);
-     EXPECT_TRUE([nscolor_panel __target]);
- 
--    // Clear the delegate and release the ColorPanelCocoa.
--    [nscolor_panel setDelegate:nil];
--
-     // Release the ColorPanelCocoa.
-     color_chooser_mac->End();
-   }
--  // Confirm the ColorPanelCocoa is no longer the NSColorPanel's target or
--  // delegate. Previously the ColorPanelCocoa would not clear the target if
--  // the delegate had already been cleared.
--  EXPECT_EQ([nscolor_panel delegate], nil);
-+  // Confirm the ColorPanelCocoa is no longer the NSColorPanel's target
-   EXPECT_EQ([nscolor_panel __target], nil);
- }
- 

patches/common/chromium/color_chooser_win.patch

@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benedek Heilig <benecene@gmail.com>
-Date: Thu, 21 Feb 2019 17:16:33 +0000
-Subject: fix some DCHECKs on Windows when using color chooser dialog
-
-Backports an upstream fix I made to the color chooser dialog on
-Windows. This can be removed once that fix lands in a chromium version we
-use. Below is the original commit message:
-
-Fix DCHECKs being triggered while using color chooser dialog on Windows
-
-This fixes two DHCECKs being triggered on Windows when using the
-dialog in a debug build. The main source of these triggered DCHECKs was
-that when the user closes the dialog, OnColorChooserDialog is called,
-which calls WebContentsImpl::DidEndColorChooser, which calls End on the
-dialog, which calls OnColorChooserDialog again. This also happened on
-macos. The other DCHECK was the receiver->HasAtLeastOneRef() one,
-because ColorChooserDialog had a PostTask in it's constructor.
-
-Change-Id: I45ec32083a5850e006034073bc29d7ec4bb63189
-
-diff --git a/chrome/browser/ui/views/color_chooser_dialog.cc b/chrome/browser/ui/views/color_chooser_dialog.cc
-index c26be855120fcef78ce995d09fb3965f796746a9..1f568a2657250c5f21ab01da88950eedc6d4e177 100644
---- a/chrome/browser/ui/views/color_chooser_dialog.cc
-+++ b/chrome/browser/ui/views/color_chooser_dialog.cc
-@@ -24,12 +24,14 @@ using content::BrowserThread;
- // static
- COLORREF ColorChooserDialog::g_custom_colors[16];
- 
--ColorChooserDialog::ColorChooserDialog(views::ColorChooserListener* listener,
--                                       SkColor initial_color,
--                                       gfx::NativeWindow owning_window)
-+ColorChooserDialog::ColorChooserDialog(views::ColorChooserListener* listener)
-     : listener_(listener) {
-   DCHECK(listener_);
-   CopyCustomColors(g_custom_colors, custom_colors_);
-+}
-+
-+void ColorChooserDialog::Open(SkColor initial_color,
-+                              gfx::NativeWindow owning_window) {
-   HWND owning_hwnd = views::HWNDForNativeWindow(owning_window);
- 
-   std::unique_ptr<RunState> run_state = BeginRun(owning_hwnd);
-diff --git a/chrome/browser/ui/views/color_chooser_dialog.h b/chrome/browser/ui/views/color_chooser_dialog.h
-index 838e22dcd1a707714a098320d5bf8174fa60a2ea..b2558ce2a226ccde0f20de9712bf33051b21799c 100644
---- a/chrome/browser/ui/views/color_chooser_dialog.h
-+++ b/chrome/browser/ui/views/color_chooser_dialog.h
-@@ -23,9 +23,9 @@ class ColorChooserDialog
-       public ui::BaseShellDialog,
-       public ui::BaseShellDialogImpl {
-  public:
--  ColorChooserDialog(views::ColorChooserListener* listener,
--                     SkColor initial_color,
--                     gfx::NativeWindow owning_window);
-+  explicit ColorChooserDialog(views::ColorChooserListener* listener);
-+
-+  void Open(SkColor initial_color, gfx::NativeWindow owning_window);
- 
-   // BaseShellDialog:
-   bool IsRunning(gfx::NativeWindow owning_window) const override;
-diff --git a/chrome/browser/ui/views/color_chooser_win.cc b/chrome/browser/ui/views/color_chooser_win.cc
-index 434842ba0f81206a43fb26874930bf7309782890..ffc58eec78dc36e21c2c04aa0b0cd9097541d2f0 100644
---- a/chrome/browser/ui/views/color_chooser_win.cc
-+++ b/chrome/browser/ui/views/color_chooser_win.cc
-@@ -61,9 +61,8 @@ ColorChooserWin::ColorChooserWin(content::WebContents* web_contents,
-                                      ->GetWidget()
-                                      ->GetView()
-                                      ->GetNativeView());
--  color_chooser_dialog_ = new ColorChooserDialog(this,
--                                                 initial_color,
--                                                 owning_window);
-+  color_chooser_dialog_ = new ColorChooserDialog(this);
-+  color_chooser_dialog_->Open(initial_color, owning_window);
- }
- 
- ColorChooserWin::~ColorChooserWin() {
-@@ -90,11 +89,11 @@ void ColorChooserWin::OnColorChooserDialogClosed() {
-   if (color_chooser_dialog_.get()) {
-     color_chooser_dialog_->ListenerDestroyed();
-     color_chooser_dialog_ = NULL;
-+    DCHECK(current_color_chooser_ == this);
-+    current_color_chooser_ = NULL;
-+    if (web_contents_)
-+      web_contents_->DidEndColorChooser();
-   }
--  DCHECK(current_color_chooser_ == this);
--  current_color_chooser_ = NULL;
--  if (web_contents_)
--    web_contents_->DidEndColorChooser();
- }
- 
- namespace chrome {

patches/common/chromium/command-ismediakey.patch

@@ -18,7 +18,7 @@ diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/
 index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e5195bfdf0e1 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
 +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
-@@ -21,6 +21,26 @@ using extensions::GlobalShortcutListenerMac;
+@@ -21,6 +21,26 @@
  
  namespace extensions {
  
@@ -96,7 +96,7 @@ index fe6aa25cc8cc372ef450e5d6658a52a2b87eabcb..e960d601062b644c0b25b657e128e065
    }
    return VKEY_UNKNOWN;
  }
-@@ -191,7 +197,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy,
+@@ -191,7 +197,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
    int key_code = (data1 & 0xFFFF0000) >> 16;
    if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
        key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&

patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch

@@ -12,10 +12,10 @@ Without this patch, calling `registerStandardSchemes` during initialization
 when in debug mode will cause a DCHECK to fire.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 2d5b996abcee44e10af11449327a266d09b19789..52a80e4541828ec8a6331f8eb3ea72960b3b83b2 100644
+index f006f0992df5b8192849799c2d3d546779d87a08..a63b9d5a95960cca15cde5e392cbe06a0325f517 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -748,7 +748,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
+@@ -757,7 +757,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
  #endif
  
      RegisterPathProvider();

patches/common/chromium/content_browser_main_loop.patch

@@ -8,7 +8,7 @@ run before shutdown. This is required to cleanup WebContents asynchronously
 in atom::CommonWebContentsDelegate::ResetManageWebContents.
 
 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index f16849bac024fbdfe7fd907143903cdf2ebe4f70..c932bfbb94d2301ca1522421b89d8a7289155926 100644
+index 368011e73ad29bbfdbd2a6d4828ce7635e1929ca..8da6c457e639b3fd0cd5352735cdc7299f682455 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
 @@ -1544,7 +1544,7 @@ void BrowserMainLoop::MainMessageLoopRun() {

patches/common/chromium/cross_site_document_resource_handler.patch

@@ -22,7 +22,7 @@ index f86a9167ac1ec5e7b082e474eb4b5f217d06df92..47df32ecb078a8f18e474f5c38faf2c7
  }
  
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index fb1f74b71c9e51c5d8c12adfff586bb57a7b6407..07afb123e6d2bdad4d1e15fdc7fe24bf267ce2f6 100644
+index 8a4f94786e75c7abecd1a53fd6f0c2c0421534db..204637b78b36b3fb0d21804295b4de73a295de5d 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -61,6 +61,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should
@@ -37,7 +37,7 @@ index fb1f74b71c9e51c5d8c12adfff586bb57a7b6407..07afb123e6d2bdad4d1e15fdc7fe24bf
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index a4f8b7ee7563e2390ef34ebce94b7c0a7967ad4d..8f4ee8f612311b8ff4c07ba1fbef8e3258fc9fb8 100644
+index bbc4263798a4cf13c0a6f3d7d62f01eb1dfe4784..1551bbad5e1a30fe6e83f85d9f66a4b18bc1bca1 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -241,6 +241,9 @@ class CONTENT_EXPORT ContentBrowserClient {

patches/common/chromium/dcheck.patch

@@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-index babf7deae808906146d9502d8528d02a5d0ffa3a..4c6537f04fc18ba3463e3dc3e10c0254ba9652dd 100644
+index 71a0a5ffb4ba7a371d418a52b2eb605140aefbe6..f15f121244890bd9d024e3c9aa83dc1ca796088d 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
 @@ -1184,8 +1184,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -33,7 +33,7 @@ index babf7deae808906146d9502d8528d02a5d0ffa3a..4c6537f04fc18ba3463e3dc3e10c0254
  
    if (rfh->GetParent()) {
      // All manual subframes would be did_create_new_entry and handled above, so
-@@ -1426,7 +1428,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
+@@ -1428,7 +1430,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
      new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
    }
  

patches/common/chromium/desktop_media_list.patch

@@ -133,7 +133,7 @@ index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b5
   protected:
    virtual ~DesktopMediaListObserver() {}
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 9d8fa1185972c4d8660d47f13238658e1facc5ef..e1973ddb0a7f0517cc66d914aa562aec5918ca1e 100644
+index 2338d6daa5c5808aea07ce6883478266a599a9d0..d8adaeecfb6eac0d87cce2cc5e7ac78ab15fee67 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
 @@ -7,14 +7,15 @@

patches/common/chromium/disable-redraw-lock.patch

@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 6fa8cd0846d253d2bf2c3ff07ff0234ee31a270a..2f7ebbb8453a5f55f07b9ee4cff9eb7ef29dc2e4 100644
+index 3703f163d2370292912d969395eccf372284db73..bedfaf0ebfefc5dcca530b8aaab4a829017f3fb9 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -290,6 +290,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;

patches/common/chromium/disable_color_correct_rendering.patch

@@ -19,7 +19,7 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index c1d49e1a7567d179134543d25b662b3d685beb87..88bba037538efc9facc3a06ee7e1edae11342ce2 100644
+index 483243c65c8f671cb6056811a51dae2e7d9b2551..75d421719b5f0d14ea7f15be163884a4b1d1ee65 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
 @@ -1574,6 +1574,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@@ -34,10 +34,10 @@ index c1d49e1a7567d179134543d25b662b3d685beb87..88bba037538efc9facc3a06ee7e1edae
    // The pending tree will have the most recently updated color space, so
    // prefer that.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 63ae9b299a947e34eee11ccdc7eae51a17905b3b..0906c9f80c4d2d9670a777866cab8200c4f237b3 100644
+index 04e48714a6f4fcf980f91d75e319667dc0ee18a4..0ec60a0bf9f903de67f69422f22b674bb3a49798 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
-@@ -98,6 +98,8 @@ class CC_EXPORT LayerTreeSettings {
+@@ -99,6 +99,8 @@ class CC_EXPORT LayerTreeSettings {
  
    bool enable_mask_tiling = true;
  
@@ -47,7 +47,7 @@ index 63ae9b299a947e34eee11ccdc7eae51a17905b3b..0906c9f80c4d2d9670a777866cab8200
    // Image Decode Service and raster tiles without images until the decode is
    // ready.
 diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
-index e34c3383ee799ff47bc7153003fce33ae6158f4a..5376bc3c47d394be77d45bb807341b4d44d05042 100644
+index ce4fb4ca4f04c5668795c56ce536b4be292aa278..a6fec64c65f5916896e627473b0f8645a867a5ce 100644
 --- a/components/viz/common/display/renderer_settings.h
 +++ b/components/viz/common/display/renderer_settings.h
 @@ -20,6 +20,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -59,7 +59,7 @@ index e34c3383ee799ff47bc7153003fce33ae6158f4a..5376bc3c47d394be77d45bb807341b4d
    bool force_antialiasing = false;
    bool force_blending_with_shaders = false;
 diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
-index a2355806937474c36cdf0089b86f9d80235684a1..dce6119c44af3259a37b727d4947fac57246e59e 100644
+index ee1f83f4d3db713f64c4175615be816198ea44a1..446df2e9b84565677ae63893391291877661a267 100644
 --- a/components/viz/host/renderer_settings_creation.cc
 +++ b/components/viz/host/renderer_settings_creation.cc
 @@ -11,6 +11,7 @@
@@ -80,7 +80,7 @@ index a2355806937474c36cdf0089b86f9d80235684a1..dce6119c44af3259a37b727d4947fac5
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  #if defined(OS_WIN)
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b011276e5a2cec 100644
+index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40918a0386 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -79,6 +79,9 @@
@@ -105,7 +105,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    // Use the full quad_rect for debug quads to not move the edges based on
    // partial swaps.
-@@ -1332,7 +1336,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
+@@ -1331,7 +1335,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
            tex_coord_precision, sampler_type, shader_blend_mode,
            params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background,
            params->use_color_matrix, tint_gl_composited_content_),
@@ -115,7 +115,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  }
  
  void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -1795,8 +1800,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -1794,8 +1799,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
    gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
    SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
                                         tint_gl_composited_content_),
@@ -126,7 +126,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
    SetShaderColor(color, opacity);
  
    if (current_program_->tint_color_matrix_location() != -1) {
-@@ -1946,8 +1951,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
+@@ -1945,8 +1950,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
                         quad->is_premultiplied ? PREMULTIPLIED_ALPHA
                                                : NON_PREMULTIPLIED_ALPHA,
                         false, false, tint_gl_composited_content_),
@@ -137,7 +137,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2035,8 +2040,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
+@@ -2037,8 +2042,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
                                                : NON_PREMULTIPLIED_ALPHA,
                         !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
                         tint_gl_composited_content_),
@@ -148,7 +148,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2131,7 +2136,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
+@@ -2136,7 +2141,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
    DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
  
    gfx::ColorSpace dst_color_space =
@@ -157,7 +157,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
    // Force sRGB output on Windows for overlay candidate video quads to match
    // DirectComposition behavior in case these switch between overlays and
    // compositing. See https://crbug.com/811118 for details.
-@@ -2279,8 +2284,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
+@@ -2284,8 +2289,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
                                                   quad->resource_id());
  
    SetUseProgram(ProgramKey::VideoStream(tex_coord_precision),
@@ -168,7 +168,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
    gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2337,8 +2342,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
+@@ -2342,8 +2347,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
        draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
  
    // Bind the program to the GL state.
@@ -179,7 +179,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
    gl_->BindTexture(locked_quad.target(), locked_quad.texture_id());
-@@ -2993,7 +2998,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
+@@ -2998,7 +3003,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
  void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
                                 const gfx::ColorSpace& src_color_space,
                                 const gfx::ColorSpace& dst_color_space) {
@@ -190,7 +190,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    ProgramKey program_key = program_key_no_color;
    const gfx::ColorTransform* color_transform =
-@@ -3347,7 +3354,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -3352,7 +3359,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
  
    *overlay_texture = FindOrCreateOverlayTexture(
        params.quad->render_pass_id, iosurface_width, iosurface_height,
@@ -199,7 +199,7 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
    *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                             gfx::SizeF((*overlay_texture)->texture.size()));
  
-@@ -3551,8 +3558,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -3556,8 +3563,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
  
    PrepareGeometry(SHARED_BINDING);
  
@@ -211,14 +211,14 @@ index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b01127
  
    gfx::Transform render_matrix;
    render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -3712,3 +3720,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
+@@ -3717,3 +3725,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
  }
  
  }  // namespace viz
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index e5e73d61a5bd26799935f08b77a520b066a2da7e..dbfb89533b84d3226f096d9af26d7aeb44c267d4 100644
+index e43e5f6bb667a62e7e1205e8da6073de6179e79f..027a552cfbfce3f4f8fe5670bec7db45ad19e57a 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -192,6 +192,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -230,10 +230,10 @@ index e5e73d61a5bd26799935f08b77a520b066a2da7e..dbfb89533b84d3226f096d9af26d7aeb
      service_manager::switches::kGpuSandboxAllowSysVShm,
      service_manager::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 24945f4ae42441ad0c0f58f8a1574afde832aa99..dd960ae24c74ea98389925fba9828b7f939341fc 100644
+index 17edbd3a08010f257152e857a178af83c9aaf3d6..dbd8c3066b61b38b43cc2bd439aa954cc06f9039 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -221,6 +221,7 @@
+@@ -220,6 +220,7 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/base/ui_base_switches_util.h"
  #include "ui/display/display_switches.h"
@@ -241,7 +241,7 @@ index 24945f4ae42441ad0c0f58f8a1574afde832aa99..dd960ae24c74ea98389925fba9828b7f
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
-@@ -2952,6 +2953,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -2951,6 +2952,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -250,10 +250,10 @@ index 24945f4ae42441ad0c0f58f8a1574afde832aa99..dd960ae24c74ea98389925fba9828b7f
      network::switches::kExplicitlyAllowedPorts,
      service_manager::switches::kDisableInProcessStackTraces,
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
-index 82907ab82b3001b523380b0e6e5deec02eac9877..b1041569ceb3555b4b53d1349934990cbaeb9d15 100644
+index 7c243ad046a6cd7fa37f7c12878cb05fb2c70d24..a3efbf63e54da43ca6f70edc067678fa5c2cca92 100644
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
-@@ -2753,6 +2753,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
+@@ -2771,6 +2771,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  

patches/common/chromium/disable_hidden.patch

@@ -5,10 +5,10 @@ Subject: disable_hidden.patch
 
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 40307f946099ea7ff1f438860f5d70acd9b979d1..1515dcfff07c6483217bc37e6897b3385eba1343 100644
+index bb1096d28ceb4117b582d7dde2f57c3317120716..61273d7aaac07635ee3497ce16af8a9e0d6f1ed8 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -766,6 +766,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -765,6 +765,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  
@@ -19,7 +19,7 @@ index 40307f946099ea7ff1f438860f5d70acd9b979d1..1515dcfff07c6483217bc37e6897b338
  
    TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index b6a90bdd0122bbf25b89e3b38032ff86b1fdf1e0..125c6bf091ce2b2eca308e72b31f5aec6351f827 100644
+index 4ea7d993a8d84eabf2485e07e51fa20f2c2c17e7..06ecfc4c90dc8105fdb2ed05386b5ea0e8a7ef3a 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -153,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch

@@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
 See https://github.com/electron/electron/issues/10754
 
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 240fe379aac8bb128b54d43cc948cf74dff20371..e43d7f8af16d0bebd0852b769b4d52973fca7aea 100644
+index 1d04d162342dafb337b014aad562cb452eddc6d4..2ba36366853b1a0435900a5946757c4bf5a92a6a 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -3664,7 +3664,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
+@@ -3689,7 +3689,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
          "frame that never had a user gesture since its load. "
          "https://www.chromestatus.com/feature/5082396709879808";
      Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);

patches/common/chromium/exclude-a-few-test-files-from-build.patch

@@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68.
 Remove the patch during the Chromium 69 upgrade.
 
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
-index b2a004631a2bc40cd2b3c354deb4815cfe66fdec..861130f88dbe2fba111fa27195dcdb74e21f37ea 100644
+index fef425f94edcd483efaa16c33b642636a19071ed..8079c15fd65fa08049360dce6d1f5ce1b9aca8a9 100644
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1738,7 +1738,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
+@@ -1729,7 +1729,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
      "graphics/paint/drawing_display_item_test.cc",
      "graphics/paint/drawing_recorder_test.cc",
      "graphics/paint/float_clip_rect_test.cc",

patches/common/chromium/fix_backup_includes_for_ptrace_get_thread_area_on_arm_arm64.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <jeremya@chromium.org>
-Date: Fri, 1 Mar 2019 11:20:29 -0800
-Subject: fix backup includes for PTRACE_GET_THREAD_AREA on arm/arm64
-
-<asm/ptrace-abi.h> doesn't exist in the arm/arm64 sysroots, and <sys/ptrace.h>
-defines PTRACE_GET_THREAD_AREA as an enum, not a #define:
-
-  /* Get the thread pointer of a process.  */
-  PTRACE_GET_THREAD_AREA = 22,
-
-This changes the include trigger to check for PT_GET_THREAD_AREA as well as
-PTRACE_GET_THREAD_AREA to catch the arm case.
-
-Change-Id: I9044d9f315cbb15011f397a06d03d4bec7396985
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 55394a791a54a2650fa2e1ed4d4e293b940d8fa2..805b13ba24b3f5d6b013b9f473e2e74afc29683d 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -34,12 +34,12 @@
- #if !defined(OS_NACL_NONSFI)
- #include <sys/ioctl.h>
- #include <sys/ptrace.h>
--#if !defined(PTRACE_GET_THREAD_AREA) && defined(OS_LINUX) && \
--    !defined(OS_CHROMEOS)
-+#if !defined(PTRACE_GET_THREAD_AREA) && !defined(__arm__) && \
-+    !defined(__aarch64__) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
- // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- #include <asm/ptrace-abi.h>
--#endif  // !PTRACE_GET_THREAD_AREA && OS_LINUX && !OS_CHROMEOS
-+#endif
- #endif  // !OS_NACL_NONSFI
- 
- #if defined(OS_ANDROID)

patches/common/chromium/frame_host_manager.patch

@@ -7,10 +7,10 @@ Allows embedder to intercept site instances chosen by chromium
 and respond with custom instance.
 
 diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
-index 11643f592deea8ae4a399ab650420d525fc4d13c..2058c5a4a1e0622c94f12e6aa2000c0e14b287a7 100644
+index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693fce8dec9b 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
-@@ -2002,6 +2002,16 @@ bool RenderFrameHostManager::InitRenderView(
+@@ -2031,6 +2031,16 @@ bool RenderFrameHostManager::InitRenderView(
  scoped_refptr<SiteInstance>
  RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      const NavigationRequest& request) {
@@ -27,7 +27,7 @@ index 11643f592deea8ae4a399ab650420d525fc4d13c..2058c5a4a1e0622c94f12e6aa2000c0e
    // First, check if the navigation can switch SiteInstances. If not, the
    // navigation should use the current SiteInstance.
    SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
-@@ -2034,6 +2044,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2063,6 +2073,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
                                                request.common_params().url);
      no_renderer_swap_allowed |=
          request.from_begin_navigation() && !can_renderer_initiate_transfer;
@@ -79,7 +79,7 @@ index 11643f592deea8ae4a399ab650420d525fc4d13c..2058c5a4a1e0622c94f12e6aa2000c0e
    } else {
      // Subframe navigations will use the current renderer, unless specifically
      // allowed to swap processes.
-@@ -2045,23 +2100,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2074,23 +2129,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
    if (no_renderer_swap_allowed && !should_swap_for_error_isolation)
      return scoped_refptr<SiteInstance>(current_site_instance);
  
@@ -108,7 +108,7 @@ index 11643f592deea8ae4a399ab650420d525fc4d13c..2058c5a4a1e0622c94f12e6aa2000c0e
  }
  
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126..fb1f74b71c9e51c5d8c12adfff586bb57a7b6407 100644
+index b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a..8a4f94786e75c7abecd1a53fd6f0c2c0421534db 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -51,6 +51,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
@@ -129,7 +129,7 @@ index 09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126..fb1f74b71c9e51c5d8c12adfff586bb5
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index a70f357b97da1a24b02e9a7b29504c63b2c780fb..a4f8b7ee7563e2390ef34ebce94b7c0a7967ad4d 100644
+index 72944bc96a2ec71be1b20fa68e7994445f225824..bbc4263798a4cf13c0a6f3d7d62f01eb1dfe4784 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(

patches/common/chromium/gritsettings_resource_ids.patch

@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
-index 6f7cfefd69acb8d9aba30444b6db49dba8ace63d..7e9a74af7a26254ec344995e758de210614a38ef 100644
+index e823c9b9edfd1aaac4909d8926e729ef79f25d70..2810e6b743507257f23a797c67ee23911c5745cf 100644
 --- a/tools/gritsettings/resource_ids
 +++ b/tools/gritsettings/resource_ids
-@@ -427,6 +427,11 @@
+@@ -424,6 +424,11 @@
      "includes": [28880],
    },
  

patches/common/chromium/mas-cfisobjc.patch

@@ -9,7 +9,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
 index 26a40417ae92c2e12c3901c50e1f101d9b0f57e9..810fbeae866a1507762703296fdd836dd3c9e4ba 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
-@@ -26,7 +26,6 @@ CFTypeID SecKeyGetTypeID();
+@@ -26,7 +26,6 @@
  #if !defined(OS_IOS)
  CFTypeID SecACLGetTypeID();
  CFTypeID SecTrustedApplicationGetTypeID();
@@ -17,7 +17,7 @@ index 26a40417ae92c2e12c3901c50e1f101d9b0f57e9..810fbeae866a1507762703296fdd836d
  #endif
  }  // extern "C"
  
-@@ -326,8 +325,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
+@@ -315,8 +314,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -27,7 +27,7 @@ index 26a40417ae92c2e12c3901c50e1f101d9b0f57e9..810fbeae866a1507762703296fdd836d
    return ns_val;
  }
  
-@@ -395,9 +393,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
+@@ -384,9 +382,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  

patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch

@@ -7,7 +7,7 @@ Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus
 private API.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index dbd925422894096998c8d4b45a40a4fd2331985c..f1f7f12a1deb9dba045c0a93a5249b48bfa4855e 100644
+index a838f0ccfe1991bf2cf7c394c5e8edba101c30ab..39e87967360a9c7a2856ce4df9c182c782efb2a5 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -278,8 +278,10 @@ int GpuMain(const MainFunctionParams& parameters) {

patches/common/chromium/mas_blink_no_private_api.patch

@@ -18,7 +18,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d
  extern "C" {
  
  // Kill ring calls. Would be better to use NSKillRing.h, but that's not
-@@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing();
+@@ -39,38 +40,53 @@
  void _NSNewKillRingSequence();
  void _NSSetKillRingToYankedState();
  }
@@ -92,7 +92,7 @@ index 7a1260db0a139f9f3f8a823af2c220f36162812a..bf9cf7046e2fc9cdfee5b92f2a348185
  
  namespace blink {
  
-@@ -73,10 +75,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
+@@ -73,10 +75,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
    // behavior change while remaining a fragile solution.
    // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
    if (!use_ns_text_field_cell) {
@@ -105,7 +105,7 @@ index 7a1260db0a139f9f3f8a823af2c220f36162812a..bf9cf7046e2fc9cdfee5b92f2a348185
      return false;
    }
  
-@@ -162,10 +166,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
+@@ -162,10 +166,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
                                      const PaintInfo& paint_info,
                                      const IntRect& r) {
    LocalCurrentGraphicsContext local_context(paint_info.context, r);

patches/common/chromium/mas_no_private_api.patch

@@ -41,7 +41,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont
 index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c04132be61fb 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
-@@ -140,6 +140,7 @@ NSDictionary* attributeToMethodNameMap = nil;
+@@ -140,6 +140,7 @@
  // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
  const int kAXResultsLimitNoLimit = -1;
  
@@ -49,7 +49,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  extern "C" {
  
  // The following are private accessibility APIs required for cursor navigation
-@@ -344,6 +345,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(
+@@ -344,6 +345,7 @@ void AddMisspelledTextAttributes(
    AddMisspelledTextAttributes(text_only_objects, attributed_text);
    return [attributed_text attributedSubstringFromRange:range];
  }
@@ -57,8 +57,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
  // Returns an autoreleased copy of the AXNodeData's attribute.
  NSString* NSStringForStringAttribute(
-@@ -595,7 +597,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-       {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
+@@ -613,7 +615,9 @@ + (void)initialize {
        {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
        {NSAccessibilityElementBusyAttribute, @"elementBusy"},
        {NSAccessibilityEnabledAttribute, @"enabled"},
@@ -68,7 +67,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
        {NSAccessibilityExpandedAttribute, @"expanded"},
        {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
        {NSAccessibilityFocusedAttribute, @"focused"},
-@@ -630,13 +634,17 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -648,13 +652,17 @@ + (void)initialize {
        {NSAccessibilityRowsAttribute, @"rows"},
        // TODO(aboxhall): expose
        // NSAccessibilityServesAsTitleForUIElementsAttribute
@@ -86,7 +85,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
        {NSAccessibilitySizeAttribute, @"size"},
        {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
        {NSAccessibilitySubroleAttribute, @"subrole"},
-@@ -1143,6 +1151,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -1143,6 +1151,7 @@ - (NSNumber*)enabled {
                                    ax::mojom::Restriction::kDisabled];
  }
  
@@ -94,7 +93,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  // Returns a text marker that points to the last character in the document that
  // can be selected with VoiceOver.
  - (id)endTextMarker {
-@@ -1062,6 +1071,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -1153,6 +1162,7 @@ - (id)endTextMarker {
    BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
    return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
  }
@@ -102,7 +101,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
  - (NSNumber*)expanded {
    if (![self instanceActive])
-@@ -1922,6 +1932,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2036,6 +2046,7 @@ - (NSValue*)selectedTextRange {
    return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
  }
  
@@ -110,7 +109,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  - (id)selectedTextMarkerRange {
    if (![self instanceActive])
      return nil;
-@@ -1954,6 +1965,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2068,6 +2079,7 @@ - (id)selectedTextMarkerRange {
                                                 anchorAffinity, *focusObject,
                                                 focusOffset, focusAffinity));
  }
@@ -118,7 +117,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
  - (NSValue*)size {
    if (![self instanceActive])
-@@ -1986,6 +1998,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2100,6 +2112,7 @@ - (NSString*)sortDirection {
    return nil;
  }
  
@@ -126,7 +125,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  // Returns a text marker that points to the first character in the document that
  // can be selected with VoiceOver.
  - (id)startTextMarker {
-@@ -1996,6 +2009,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2110,6 +2123,7 @@ - (id)startTextMarker {
    BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
    return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
  }
@@ -134,7 +133,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
  // Returns a subrole based upon the role.
  - (NSString*) subrole {
-@@ -2301,12 +2315,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2415,12 +2429,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
    NSMutableAttributedString* attributedValue =
        [[[NSMutableAttributedString alloc] initWithString:value] autorelease];
  
@@ -149,7 +148,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
    return [attributedValue attributedSubstringFromRange:range];
  }
-@@ -2392,6 +2408,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2506,6 +2522,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
        return ToBrowserAccessibilityCocoa(cell);
    }
  
@@ -157,7 +156,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
    if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
      BrowserAccessibilityPositionInstance position =
          CreatePositionFromTextMarker(parameter);
-@@ -2569,6 +2586,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2683,6 +2700,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
      NSString* text = GetTextForTextMarkerRange(parameter);
      return [NSNumber numberWithInt:[text length]];
    }
@@ -165,7 +164,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
  
    if ([attribute isEqualToString:
        NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -2602,6 +2620,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2716,6 +2734,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
      return nil;
    }
  
@@ -173,7 +172,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
    if ([attribute isEqualToString:
             NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
      BrowserAccessibilityPositionInstance position =
-@@ -2677,6 +2696,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
+@@ -2791,6 +2810,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
  
      return @(child->GetIndexInParent());
    }
@@ -185,7 +184,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 index 7fe7130abd6a4844dd503b9cee198c8204cb0985..3e6b0ad576d3aa9951f84f6ce4175d84ffd67036 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-@@ -463,6 +463,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
+@@ -464,6 +464,7 @@ void PostAnnouncementNotification(NSString* announcement) {
        [user_info setObject:native_focus_object
                      forKey:NSAccessibilityTextChangeElement];
  
@@ -193,7 +192,7 @@ index 7fe7130abd6a4844dd503b9cee198c8204cb0985..3e6b0ad576d3aa9951f84f6ce4175d84
        id selected_text = [native_focus_object selectedTextMarkerRange];
        if (selected_text) {
          NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-@@ -470,6 +471,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
+@@ -471,6 +472,7 @@ void PostAnnouncementNotification(NSString* announcement) {
          [user_info setObject:selected_text
                        forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
        }
@@ -217,7 +216,7 @@ index d6e9a7064687abfcf5fa874ee0a454806586db04..7c7db44d8d66ca1f9ad570abf552b645
  
  namespace content {
  
-@@ -35,6 +37,7 @@ namespace {
+@@ -35,6 +37,7 @@
  // verifies there are no existing open connections), and then indicates that
  // Chrome should continue execution without access to launchservicesd.
  void DisableSystemServices() {
@@ -245,7 +244,7 @@ index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea
  extern "C" {
  // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
  // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
-@@ -49,6 +50,7 @@ extern "C" {
+@@ -49,6 +50,7 @@
  // [4] https://support.apple.com/kb/PH25091
  void IOBluetoothPreferenceSetControllerPowerState(int state);
  }
@@ -253,7 +252,7 @@ index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea
  
  namespace {
  
-@@ -128,8 +130,10 @@ BluetoothAdapterMac::BluetoothAdapterMac()
+@@ -128,8 +130,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
        controller_state_function_(
            base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
                                base::Unretained(this))),
@@ -264,7 +263,7 @@ index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea
        should_update_name_(true),
        classic_discovery_manager_(
            BluetoothDiscoveryManagerMac::CreateClassic(this)),
-@@ -327,8 +331,12 @@ bool BluetoothAdapterMac::IsLowEnergyAvailable() {
+@@ -327,8 +331,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
  }
  
  bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
@@ -308,10 +307,10 @@ index a1091960873dad8bb1b0129d20a552bf8a51739f..50bb186d1474fd4c90723ac97ac93b1d
  }
  
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 061a011b5f3c681d417c856611dd8240fc96e709..c724ab5355464721b07dfa4d6f2a4014638d0536 100644
+index 6e45b8031b6373b3979f2cc8dd89ae3c3b12f535..6e1a3c7c3ddd3e7c2d2cd2b38680479e50ee5340 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
-@@ -244,6 +244,7 @@ class DnsConfigServicePosix::Watcher {
+@@ -245,6 +245,7 @@ class DnsConfigServicePosix::Watcher {
  
    bool Watch() {
      bool success = true;
@@ -319,7 +318,7 @@ index 061a011b5f3c681d417c856611dd8240fc96e709..c724ab5355464721b07dfa4d6f2a4014
      if (!config_watcher_.Watch(base::Bind(&Watcher::OnConfigChanged,
                                            base::Unretained(this)))) {
        LOG(ERROR) << "DNS config watch failed to start.";
-@@ -265,6 +266,7 @@ class DnsConfigServicePosix::Watcher {
+@@ -266,6 +267,7 @@ class DnsConfigServicePosix::Watcher {
                                  DNS_CONFIG_WATCH_MAX);
      }
  #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)

patches/common/chromium/no_cache_storage_check.patch

@@ -7,10 +7,10 @@ Do not check for unique origin in CacheStorage, in Electron we may have
 scripts running without an origin.
 
 diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
-index 1d1df9314540da38ce853dad354bc2ca96e2c361..1231c4747ec2882aed85fdda29531275f47b20ed 100644
+index 9e0249a6060b4d84cd8a99db2e40d96b4e715148..2e8e12de9778eeb2bc45e293b6653feeb5b6f779 100644
 --- a/content/browser/cache_storage/cache_storage.cc
 +++ b/content/browser/cache_storage/cache_storage.cc
-@@ -133,7 +133,7 @@ class CacheStorage::CacheLoader {
+@@ -103,7 +103,7 @@ class CacheStorage::CacheLoader {
          cache_storage_(cache_storage),
          origin_(origin),
          owner_(owner) {

patches/common/chromium/notification_provenance.patch

@@ -6,7 +6,7 @@ Subject: pass RenderProcessHost through to PlatformNotificationService
 this is so Electron can identify which renderer a notification came from
 
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index f49963aad901c4f1f32be4995613355f5a6d2e14..eb2e8b6fcc5b00c3a74c88d79db9d20653cdd2f2 100644
+index 7c6b38b94d714ec2a878ce3cf0448028fbf7c19b..f26dd52579544ad030b603a16ef0ff03ecebb42a 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
 @@ -50,9 +50,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
@@ -31,7 +31,7 @@ index f49963aad901c4f1f32be4995613355f5a6d2e14..eb2e8b6fcc5b00c3a74c88d79db9d206
  }
  
 diff --git a/content/browser/notifications/blink_notification_service_impl.h b/content/browser/notifications/blink_notification_service_impl.h
-index 9b927ba78d006b599b7dc6776e50a76d581c9e9e..ab16372bcc7a1a4c8ddc1c56edd46b6d78393ae1 100644
+index 088637b68b1fb40fb8a32bb72781b425077e668a..ec2cce6b644e6cc8fd899a761fb55d9a01b65f98 100644
 --- a/content/browser/notifications/blink_notification_service_impl.h
 +++ b/content/browser/notifications/blink_notification_service_impl.h
 @@ -36,6 +36,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
@@ -42,7 +42,7 @@ index 9b927ba78d006b599b7dc6776e50a76d581c9e9e..ab16372bcc7a1a4c8ddc1c56edd46b6d
        const url::Origin& origin,
        mojo::InterfaceRequest<blink::mojom::NotificationService> request);
    ~BlinkNotificationServiceImpl() override;
-@@ -97,6 +98,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
+@@ -99,6 +100,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
    // The notification context that owns this service instance.
    PlatformNotificationContextImpl* notification_context_;
  
@@ -51,7 +51,7 @@ index 9b927ba78d006b599b7dc6776e50a76d581c9e9e..ab16372bcc7a1a4c8ddc1c56edd46b6d
  
    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-index 5bb02dcf4011d23de6b8b70050555555aa31d669..6cf025c744d988389452b31a2ba18bf6ed69357c 100644
+index 759e317999ec4f37f185310724374c655c2f24fe..874f6d1fb6d2bddc0e6711080adfadc3f7156b0e 100644
 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
 +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
 @@ -127,7 +127,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {

patches/common/chromium/out_of_process_instance.patch

@@ -5,7 +5,7 @@ Subject: out_of_process_instance.patch
 
 
 diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
-index 109f45633e2ccc1f6c6c8e65176b97b86caad7c4..eb706c59d4e7a9fc270f502a43fc038f21c455a1 100644
+index 25bb9fdd9b5c4cedccd401ca24d75807ddd77842..38987a29fdccbf1d4740779157b296cd4ea46cb2 100644
 --- a/pdf/out_of_process_instance.cc
 +++ b/pdf/out_of_process_instance.cc
 @@ -462,7 +462,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,

patches/common/chromium/printing.patch

@@ -166,20 +166,20 @@ index a2569836d04ff968e690215f56f6de3b6d884874..6ddec22641b74d5484c2e0d4f62e5d71
    bool printing_succeeded_;
  
 diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
-index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315f33631b0 100644
+index 3f6007d5c09ee9fdab534356d38d1e06e4573794..5ebb5e5255fefd2e8e611144a0745e92e069ea62 100644
 --- a/chrome/browser/printing/printing_message_filter.cc
 +++ b/chrome/browser/printing/printing_message_filter.cc
 @@ -22,6 +22,7 @@
+ #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
  #include "components/printing/browser/print_manager_utils.h"
  #include "components/printing/common/print_messages.h"
- #include "content/public/browser/browser_task_traits.h"
 +#include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/web_contents.h"
- #include "content/public/common/child_process_host.h"
-@@ -82,20 +83,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
- 
- }  // namespace
+@@ -95,20 +96,23 @@ void PrintingMessageFilter::SetTestUpdatePrintSettingsReply(
+   test_params = print_params;
+ }
  
 -PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
 -                                             Profile* profile)
@@ -204,7 +204,7 @@ index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315
  }
  
  PrintingMessageFilter::~PrintingMessageFilter() {
-@@ -131,11 +135,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
+@@ -144,11 +148,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
  void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
    scoped_refptr<PrinterQuery> printer_query;
@@ -218,7 +218,7 @@ index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315
    printer_query = queue_->PopPrinterQuery(0);
    if (!printer_query.get()) {
      printer_query =
-@@ -221,11 +227,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
+@@ -234,11 +240,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
                                                    base::Value job_settings,
                                                    IPC::Message* reply_msg) {
    scoped_refptr<PrinterQuery> printer_query;
@@ -232,7 +232,7 @@ index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315
    printer_query = queue_->PopPrinterQuery(document_cookie);
    if (!printer_query.get()) {
      printer_query = queue_->CreatePrinterQuery(
-@@ -284,7 +292,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
+@@ -302,7 +310,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
  void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
                                               bool* cancel) {
@@ -242,11 +242,11 @@ index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315
  #endif
  
 diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
-index c4d586e62f14c3002993a2dbc7e478027d8f9b02..85d5fc55e93bea0080cd03316f29856bcaf27b59 100644
+index 4607c9af91bb604bb4753eb54c2013e58698ff30..58cbf62a1bc1e18327e987cd55524848d2eca05e 100644
 --- a/chrome/browser/printing/printing_message_filter.h
 +++ b/chrome/browser/printing/printing_message_filter.h
-@@ -23,6 +23,10 @@ struct PrintHostMsg_PreviewIds;
- struct PrintHostMsg_ScriptedPrint_Params;
+@@ -24,6 +24,10 @@ struct PrintHostMsg_ScriptedPrint_Params;
+ struct PrintMsg_Print_Params;
  class Profile;
  
 +namespace content {
@@ -256,10 +256,10 @@ index c4d586e62f14c3002993a2dbc7e478027d8f9b02..85d5fc55e93bea0080cd03316f29856b
  namespace printing {
  
  class PrintQueriesQueue;
-@@ -32,7 +36,8 @@ class PrinterQuery;
- // renderer process on the IPC thread.
- class PrintingMessageFilter : public content::BrowserMessageFilter {
-  public:
+@@ -37,7 +41,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
+   static void SetTestUpdatePrintSettingsReply(
+       const PrintMsg_Print_Params& print_params);
+ 
 -  PrintingMessageFilter(int render_process_id, Profile* profile);
 +  PrintingMessageFilter(int render_process_id,
 +                        content::BrowserContext* browser_context);

patches/common/chromium/render_widget_host_view_mac.patch

@@ -20,7 +20,7 @@ index ed18a0a46c22620850d4384e6bb82dba80a3b6d8..c940999eeec8fcf2a2a4514d0edd67f8
  // These are not documented, so use only after checking -respondsToSelector:.
  @interface NSApplication (UndocumentedSpeechMethods)
  - (void)speakString:(NSString*)string;
-@@ -403,6 +408,9 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -403,6 +408,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -30,7 +30,7 @@ index ed18a0a46c22620850d4384e6bb82dba80a3b6d8..c940999eeec8fcf2a2a4514d0edd67f8
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -765,6 +773,10 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -765,6 +773,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSKeyDown &&
                                !(modifierFlags & NSCommandKeyMask);
  
@@ -41,7 +41,7 @@ index ed18a0a46c22620850d4384e6bb82dba80a3b6d8..c940999eeec8fcf2a2a4514d0edd67f8
    // We only handle key down events and just simply forward other events.
    if (eventType != NSKeyDown) {
      clientHelper_->ForwardKeyboardEvent(event, latency_info);
-@@ -1513,9 +1525,11 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -1513,9 +1525,11 @@ - (id)accessibilityFocusedUIElement {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -53,7 +53,7 @@ index ed18a0a46c22620850d4384e6bb82dba80a3b6d8..c940999eeec8fcf2a2a4514d0edd67f8
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1524,7 +1538,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
+@@ -1524,7 +1538,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,

patches/common/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 475e595d3e397bae23c3db02d79bd1622464e944..194484dc9814aff52789630ba81f2c3d806a964a 100644
+index ececd22ccf241a21666b1964c4bce053e1ab504a..2b1b875437102c9fd2573df3ad0688a40a69d499 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1648,7 +1648,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1647,7 +1647,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 475e595d3e397bae23c3db02d79bd1622464e944..194484dc9814aff52789630ba81f2c3d
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1672,6 +1672,12 @@ if (!is_android) {
+@@ -1671,6 +1671,12 @@ if (!is_android) {
    }
  }
  

patches/common/chromium/revert_build_swiftshader_for_arm32.patch

@@ -6,7 +6,7 @@ Subject: Revert "Build swiftshader for ARM32."
 This reverts commit e7caa7ca82fc015675aea8cecf178c83a94ab3a7.
 
 diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
-index cb976c10b69cc4a1de84ad54bf341b56f24b993c..c896acf7785e8d30c7f742b487c2a28d41acd95b 100644
+index 2b80ce0756be0f8153edebb409ac3981a0cefa9a..f04dc7baf9186194936cbb7c2df40ed709a9bc6f 100644
 --- a/ui/gl/BUILD.gn
 +++ b/ui/gl/BUILD.gn
 @@ -15,8 +15,8 @@ declare_args() {

patches/common/chromium/support_mixed_sandbox_with_zygote.patch

@@ -22,10 +22,10 @@ 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 1c602b87aed88a2487384e345b413cfcb951b278..24945f4ae42441ad0c0f58f8a1574afde832aa99 100644
+index c6feebd62b98c18d260088b5a60fc59b2c2e0d1a..17edbd3a08010f257152e857a178af83c9aaf3d6 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -424,6 +424,10 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -423,6 +423,10 @@ class RendererSandboxedProcessLauncherDelegate
      : public SandboxedProcessLauncherDelegate {
   public:
    RendererSandboxedProcessLauncherDelegate() {}
@@ -36,7 +36,7 @@ index 1c602b87aed88a2487384e345b413cfcb951b278..24945f4ae42441ad0c0f58f8a1574afd
  
    ~RendererSandboxedProcessLauncherDelegate() override {}
  
-@@ -443,6 +447,9 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -442,6 +446,9 @@ class RendererSandboxedProcessLauncherDelegate
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
    service_manager::ZygoteHandle GetZygote() override {
@@ -46,7 +46,7 @@ index 1c602b87aed88a2487384e345b413cfcb951b278..24945f4ae42441ad0c0f58f8a1574afd
      const base::CommandLine& browser_command_line =
          *base::CommandLine::ForCurrentProcess();
      base::CommandLine::StringType renderer_prefix =
-@@ -456,6 +463,11 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -455,6 +462,11 @@ class RendererSandboxedProcessLauncherDelegate
    service_manager::SandboxType GetSandboxType() override {
      return service_manager::SANDBOX_TYPE_RENDERER;
    }
@@ -58,7 +58,7 @@ index 1c602b87aed88a2487384e345b413cfcb951b278..24945f4ae42441ad0c0f58f8a1574afd
  };
  
  const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1749,11 +1761,18 @@ bool RenderProcessHostImpl::Init() {
+@@ -1748,11 +1760,18 @@ bool RenderProcessHostImpl::Init() {
        cmd_line->PrependWrapper(renderer_prefix);
      AppendRendererCommandLine(cmd_line.get());
  

patches/common/chromium/tts.patch

@@ -10,7 +10,7 @@ Subject: tts.patch
   destruction from content layer.
 
 diff --git a/chrome/browser/speech/tts_controller_delegate_impl.cc b/chrome/browser/speech/tts_controller_delegate_impl.cc
-index 0390cfe18859a4b7086b275b62121199473434fb..b9adf92701546ea8f8fa8258d987fa0c7051def4 100644
+index 019a4103fc230dc4653c80bb0fbd6bda18a05b79..3c6e3936efd7c73b84e8b19c080f2633ed8b6e48 100644
 --- a/chrome/browser/speech/tts_controller_delegate_impl.cc
 +++ b/chrome/browser/speech/tts_controller_delegate_impl.cc
 @@ -213,6 +213,7 @@ void TtsControllerDelegateImpl::UpdateUtteranceDefaultsFromPrefs(

patches/common/chromium/web_contents.patch

@@ -5,10 +5,10 @@ Subject: web_contents.patch
 
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 69498d1369aa2722fafaeecdebd27edf2d00e34b..55a43dc6dd9d0d046693902dd25cd771dcc56a79 100644
+index 09c35a2bfe0c9d347e3b06d32d839aef50ef3f41..eca683e0529784699425a6432b96dff76fc20f1d 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2049,6 +2049,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2047,6 +2047,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
    std::string unique_name;
    frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
  
@@ -21,7 +21,7 @@ index 69498d1369aa2722fafaeecdebd27edf2d00e34b..55a43dc6dd9d0d046693902dd25cd771
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2064,6 +2070,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2062,6 +2068,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
            &render_view_host_delegate_view_);
      }
    }
@@ -30,7 +30,7 @@ index 69498d1369aa2722fafaeecdebd27edf2d00e34b..55a43dc6dd9d0d046693902dd25cd771
    CHECK(view_.get());
  
 diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
-index 5de4d7cf8a7a812ad3f6383cd60acbd39135924d..dca9ec76b44be34124a12f453d3c6ecbb1509b9f 100644
+index 9d91d225fd9f3eeef7d9beec126e6cc6a58a76d7..8a443514dfbdab37f951bc7c54cf1989a2b01a16 100644
 --- a/content/browser/web_contents/web_contents_view_guest.cc
 +++ b/content/browser/web_contents/web_contents_view_guest.cc
 @@ -69,19 +69,26 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const {
@@ -90,7 +90,7 @@ index 5de4d7cf8a7a812ad3f6383cd60acbd39135924d..dca9ec76b44be34124a12f453d3c6ecb
  
  RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget(
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 87031ac3aaaabaf587ed261238163d6b4d1d8b33..90ccb0ea171e9fccb3a11f5f928fdb3f0929de8f 100644
+index 2fe0a25aed9f2fbcf6a7d308fa4deefb7c051f79..cce64cb2b376ee3445eed94b1399a6efb19c0d79 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -75,9 +75,12 @@ class BrowserPluginGuestDelegate;

patches/common/chromium/webview_cross_drag.patch

@@ -20,7 +20,7 @@ diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser
 index 9423f9c8a225f9d18f6dcd0b9f7de033cbe495df..e7fe311327f698a760c09db2c7677a10c59f5224 100644
 --- a/content/browser/web_contents/web_drag_dest_mac.mm
 +++ b/content/browser/web_contents/web_drag_dest_mac.mm
-@@ -336,6 +336,7 @@ content::GlobalRoutingID GetRenderViewHostID(content::RenderViewHost* rvh) {
+@@ -336,6 +336,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
  }
  
  - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

patches/common/chromium/worker_context_will_destroy.patch

@@ -5,10 +5,10 @@ Subject: worker_context_will_destroy.patch
 
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index fd33e51221676c6315aec8db4aa469d4805dab8a..af15512b6d26bf79413e34a590d664a56d78828d 100644
+index 3b5c53a10c8d6aa2e173a7e7788e8955c7299d4f..614f5f8296c13f127cb081d1b05c908a52c92daf 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -379,6 +379,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -384,6 +384,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  

patches/common/v8/add_realloc.patch

@@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
 Realloc on the v8 side.
 
 diff --git a/include/v8.h b/include/v8.h
-index f9ef26bc3c323c7c706cdd8207be569a1a500829..7345f9d6fb374a0175d4c22d9d85c470ea04522d 100644
+index 4e9af49e6b2e00111b44b03ce2a9a66c2d7d5563..e19bdc0ca5a247d82370d7081491bfc3870ca81e 100644
 --- a/include/v8.h
 +++ b/include/v8.h
-@@ -4694,6 +4694,13 @@ class V8_EXPORT ArrayBuffer : public Object {
+@@ -4695,6 +4695,13 @@ class V8_EXPORT ArrayBuffer : public Object {
       */
      virtual void* AllocateUninitialized(size_t length) = 0;
  
@@ -30,7 +30,7 @@ index f9ef26bc3c323c7c706cdd8207be569a1a500829..7345f9d6fb374a0175d4c22d9d85c470
       * Free the memory block of size |length|, pointed to by |data|.
       * That memory is guaranteed to be previously allocated by |Allocate|.
 diff --git a/src/api.cc b/src/api.cc
-index 940cd268d329d1882abde36d6b9be2144fae6263..332211259a4f2a108c5734fc1b3048f2d635c692 100644
+index 5a06fd039026bb6de9d0076ca6eab5d823229095..39bea066c11597649a06a14b8575de83e18f65fa 100644
 --- a/src/api.cc
 +++ b/src/api.cc
 @@ -516,6 +516,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch

@@ -6,7 +6,7 @@ Subject: build-torque-with-x64-toolchain-on-arm.patch
 torque binary has to be run during the build.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index f544888a6ee6f41e873b956c941a8d1ed3963128..4a36ec8d550688a258aea35dbc05666ba8ee7f82 100644
+index 5b3e0831c2657f4fa07adaa1de5fda6d2360c2ec..344a7fb5c5e54295fc7fd4f61780bdcf40bd6bd4 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -178,7 +178,9 @@ declare_args() {
@@ -20,7 +20,7 @@ index f544888a6ee6f41e873b956c941a8d1ed3963128..4a36ec8d550688a258aea35dbc05666b
    v8_generator_toolchain = "//build/toolchain/linux:clang_x64"
  }
  
-@@ -3497,7 +3499,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
+@@ -3539,7 +3541,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
    }
  }
  

patches/common/v8/build_gn.patch

@@ -5,7 +5,7 @@ Subject: build_gn.patch
 
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 8005b08007104b0d972eabc12587b9e1c56f0316..5c3b772c7b71c26b40ba7f69210bff57ed1198e6 100644
+index af4cf7667e274462878580ddba56f4168d89f237..65a82149f400d65ffd5c3be68bc4306e80b3cff7 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -240,7 +240,7 @@ config("internal_config") {
@@ -17,7 +17,7 @@ index 8005b08007104b0d972eabc12587b9e1c56f0316..5c3b772c7b71c26b40ba7f69210bff57
      defines += [ "BUILDING_V8_SHARED" ]
    }
  }
-@@ -3482,6 +3482,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
+@@ -3524,6 +3524,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  

patches/common/v8/dcheck.patch

@@ -5,10 +5,10 @@ Subject: dcheck.patch
 
 
 diff --git a/src/api.cc b/src/api.cc
-index c9310487d9b2a5dac5e1ea94fc72b5925d76fbbe..302156acabc0dc70190f0512874ac0722a00cda5 100644
+index b14e53bc93102157841316d1fdbdb524a1a89c73..63a0ed79fb8dbc78db0ff9578ef1bb5cfc1663f5 100644
 --- a/src/api.cc
 +++ b/src/api.cc
-@@ -8624,7 +8624,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -8628,7 +8628,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  
  
  void Isolate::RunMicrotasks() {
@@ -18,10 +18,10 @@ index c9310487d9b2a5dac5e1ea94fc72b5925d76fbbe..302156acabc0dc70190f0512874ac072
    isolate->default_microtask_queue()->RunMicrotasks(isolate);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 1b4c11179eeed05eb8db9286d41d46b310e36fa4..86a28087996001a0171f10f32fa7f3515db64e7b 100644
+index 0462e9ee245cbfec985ae1a2ffe4f6699531e3aa..3c312c97f152846980073ab4187ac47fa388b46f 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -4836,9 +4836,9 @@ void Heap::TearDown() {
+@@ -4848,9 +4848,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);

patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch

@@ -20,10 +20,10 @@ Reviewed-By: James M Snell <jasnell@gmail.com>
 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
 
 diff --git a/src/flag-definitions.h b/src/flag-definitions.h
-index 09ef72d57b745d938e34e098d82e2fb3fe2f90ce..324e0759329d0e3b0c27d07bea6f97e4a2422f35 100644
+index c7dc7520ebc17f63dbba74225000c84f6d3d0152..07d965d39ad08c9f0aa9af199ac4f0124c233bcd 100644
 --- a/src/flag-definitions.h
 +++ b/src/flag-definitions.h
-@@ -1320,7 +1320,7 @@ DEFINE_BOOL(log_function_events, false,
+@@ -1321,7 +1321,7 @@ DEFINE_BOOL(log_function_events, false,
  DEFINE_BOOL(prof, false,
              "Log statistical profiling information (implies --log-code).")
  

patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch

@@ -22,10 +22,10 @@ Reviewed-By: Yang Guo <yangguo@chromium.org>
 Reviewed-By: Michaël Zasso <targos@protonmail.com>
 
 diff --git a/include/v8.h b/include/v8.h
-index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d3241e6fecc 100644
+index e19bdc0ca5a247d82370d7081491bfc3870ca81e..2a67b22279edff6915a56d2e5e37f3415dde77e8 100644
 --- a/include/v8.h
 +++ b/include/v8.h
-@@ -1143,6 +1143,10 @@ class V8_EXPORT PrimitiveArray {
+@@ -1144,6 +1144,10 @@ class V8_EXPORT PrimitiveArray {
   public:
    static Local<PrimitiveArray> New(Isolate* isolate, int length);
    int Length() const;
@@ -36,7 +36,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
    void Set(Isolate* isolate, int index, Local<Primitive> item);
    Local<Primitive> Get(Isolate* isolate, int index);
  };
-@@ -1846,6 +1850,8 @@ class V8_EXPORT StackTrace {
+@@ -1847,6 +1851,8 @@ class V8_EXPORT StackTrace {
    /**
     * Returns a StackFrame at a particular index.
     */
@@ -45,7 +45,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
    Local<StackFrame> GetFrame(Isolate* isolate, uint32_t index) const;
  
    /**
-@@ -2546,6 +2552,13 @@ class V8_EXPORT Value : public Data {
+@@ -2547,6 +2553,13 @@ class V8_EXPORT Value : public Data {
    V8_DEPRECATE_SOON("Use maybe version",
                      Local<Int32> ToInt32(Isolate* isolate) const);
  
@@ -59,7 +59,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
    /**
     * Attempts to convert a string to an array index.
     * Returns an empty handle if the conversion fails.
-@@ -2565,7 +2578,14 @@ class V8_EXPORT Value : public Data {
+@@ -2566,7 +2579,14 @@ class V8_EXPORT Value : public Data {
        Local<Context> context) const;
    V8_WARN_UNUSED_RESULT Maybe<int32_t> Int32Value(Local<Context> context) const;
  
@@ -74,7 +74,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
    V8_WARN_UNUSED_RESULT Maybe<bool> Equals(Local<Context> context,
                                             Local<Value> that) const;
    bool StrictEquals(Local<Value> that) const;
-@@ -2672,6 +2692,8 @@ class V8_EXPORT String : public Name {
+@@ -2673,6 +2693,8 @@ class V8_EXPORT String : public Name {
     * Returns the number of bytes in the UTF-8 encoded
     * representation of this string.
     */
@@ -83,7 +83,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
    int Utf8Length(Isolate* isolate) const;
  
    /**
-@@ -2728,12 +2750,23 @@ class V8_EXPORT String : public Name {
+@@ -2729,12 +2751,23 @@ class V8_EXPORT String : public Name {
    // 16-bit character codes.
    int Write(Isolate* isolate, uint16_t* buffer, int start = 0, int length = -1,
              int options = NO_OPTIONS) const;
@@ -107,7 +107,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
  
    /**
     * A zero length string.
-@@ -2921,6 +2954,9 @@ class V8_EXPORT String : public Name {
+@@ -2922,6 +2955,9 @@ class V8_EXPORT String : public Name {
     */
    static Local<String> Concat(Isolate* isolate, Local<String> left,
                                Local<String> right);
@@ -117,7 +117,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
  
    /**
     * Creates a new external string using the data defined in the given
-@@ -2989,6 +3025,8 @@ class V8_EXPORT String : public Name {
+@@ -2990,6 +3026,8 @@ class V8_EXPORT String : public Name {
     */
    class V8_EXPORT Utf8Value {
     public:
@@ -126,7 +126,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
      Utf8Value(Isolate* isolate, Local<v8::Value> obj);
      ~Utf8Value();
      char* operator*() { return str_; }
-@@ -3012,6 +3050,7 @@ class V8_EXPORT String : public Name {
+@@ -3013,6 +3051,7 @@ class V8_EXPORT String : public Name {
     */
    class V8_EXPORT Value {
     public:
@@ -134,7 +134,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
      Value(Isolate* isolate, Local<v8::Value> obj);
      ~Value();
      uint16_t* operator*() { return str_; }
-@@ -5383,6 +5422,8 @@ class V8_EXPORT BooleanObject : public Object {
+@@ -5384,6 +5423,8 @@ class V8_EXPORT BooleanObject : public Object {
  class V8_EXPORT StringObject : public Object {
   public:
    static Local<Value> New(Isolate* isolate, Local<String> value);
@@ -143,7 +143,7 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
  
    Local<String> ValueOf() const;
  
-@@ -10368,6 +10409,30 @@ template <class T> Value* Value::Cast(T* value) {
+@@ -10454,6 +10495,30 @@ template <class T> Value* Value::Cast(T* value) {
  }
  
  
@@ -175,10 +175,10 @@ index 7345f9d6fb374a0175d4c22d9d85c470ea04522d..133a3dba8519c344f6dc4229cc5d5d32
  #ifdef V8_ENABLE_CHECKS
    CheckCast(value);
 diff --git a/src/api.cc b/src/api.cc
-index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b5925d76fbbe 100644
+index 39bea066c11597649a06a14b8575de83e18f65fa..b14e53bc93102157841316d1fdbdb524a1a89c73 100644
 --- a/src/api.cc
 +++ b/src/api.cc
-@@ -2230,6 +2230,10 @@ int PrimitiveArray::Length() const {
+@@ -2227,6 +2227,10 @@ int PrimitiveArray::Length() const {
    return array->length();
  }
  
@@ -189,7 +189,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  void PrimitiveArray::Set(Isolate* v8_isolate, int index,
                           Local<Primitive> item) {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -2243,6 +2247,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index,
+@@ -2240,6 +2244,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index,
    array->set(index, *i_item);
  }
  
@@ -200,7 +200,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Local<Primitive> PrimitiveArray::Get(Isolate* v8_isolate, int index) {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
    i::Handle<i::FixedArray> array = Utils::OpenHandle(this);
-@@ -2948,6 +2956,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) {
+@@ -2945,6 +2953,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) {
  
  // --- S t a c k T r a c e ---
  
@@ -211,7 +211,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Local<StackFrame> StackTrace::GetFrame(Isolate* v8_isolate,
                                         uint32_t index) const {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -3912,6 +3924,36 @@ void v8::RegExp::CheckCast(v8::Value* that) {
+@@ -3909,6 +3921,36 @@ void v8::RegExp::CheckCast(v8::Value* that) {
  }
  
  
@@ -248,7 +248,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Maybe<bool> Value::BooleanValue(Local<Context> context) const {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(context->GetIsolate());
    return Just(Utils::OpenHandle(this)->BooleanValue(isolate));
-@@ -4000,6 +4042,12 @@ MaybeLocal<Uint32> Value::ToArrayIndex(Local<Context> context) const {
+@@ -3997,6 +4039,12 @@ MaybeLocal<Uint32> Value::ToArrayIndex(Local<Context> context) const {
  }
  
  
@@ -261,7 +261,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Maybe<bool> Value::Equals(Local<Context> context, Local<Value> that) const {
    i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate();
    auto self = Utils::OpenHandle(this);
-@@ -5278,6 +5326,10 @@ bool String::ContainsOnlyOneByte() const {
+@@ -5275,6 +5323,10 @@ bool String::ContainsOnlyOneByte() const {
    return helper.Check(*str);
  }
  
@@ -272,7 +272,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  int String::Utf8Length(Isolate* isolate) const {
    i::Handle<i::String> str = Utils::OpenHandle(this);
    str = i::String::Flatten(reinterpret_cast<i::Isolate*>(isolate), str);
-@@ -5430,6 +5482,14 @@ static int WriteUtf8Impl(i::Vector<const Char> string, char* write_start,
+@@ -5427,6 +5479,14 @@ static int WriteUtf8Impl(i::Vector<const Char> string, char* write_start,
  }
  }  // anonymous namespace
  
@@ -287,7 +287,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity,
                        int* nchars_ref, int options) const {
    i::Handle<i::String> str = Utils::OpenHandle(this);
-@@ -5470,6 +5530,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string,
+@@ -5467,6 +5527,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string,
  }
  
  
@@ -306,7 +306,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start,
                           int length, int options) const {
    return WriteHelper(reinterpret_cast<i::Isolate*>(isolate), this, buffer,
-@@ -6419,6 +6491,11 @@ MaybeLocal<String> String::NewFromTwoByte(Isolate* isolate,
+@@ -6423,6 +6495,11 @@ MaybeLocal<String> String::NewFromTwoByte(Isolate* isolate,
    return result;
  }
  
@@ -318,7 +318,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Local<String> v8::String::Concat(Isolate* v8_isolate, Local<String> left,
                                   Local<String> right) {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -6701,6 +6778,11 @@ bool v8::BooleanObject::ValueOf() const {
+@@ -6705,6 +6782,11 @@ bool v8::BooleanObject::ValueOf() const {
  }
  
  
@@ -330,8 +330,8 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate,
                                         Local<String> value) {
    i::Handle<i::String> string = Utils::OpenHandle(*value);
-@@ -8931,6 +9013,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) {
-   return isolate->default_microtask_queue()->IsRunningMicrotasks();
+@@ -8951,6 +9033,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
+   return microtask_queue->IsRunningMicrotasks();
  }
  
 +String::Utf8Value::Utf8Value(v8::Local<v8::Value> obj)
@@ -340,7 +340,7 @@ index 332211259a4f2a108c5734fc1b3048f2d635c692..c9310487d9b2a5dac5e1ea94fc72b592
  String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
      : str_(nullptr), length_(0) {
    if (obj.IsEmpty()) return;
-@@ -8950,6 +9035,9 @@ String::Utf8Value::~Utf8Value() {
+@@ -8970,6 +9055,9 @@ String::Utf8Value::~Utf8Value() {
    i::DeleteArray(str_);
  }
  

patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch

@@ -10,10 +10,10 @@ Electron does, so this patch makes sure that the build doesn't try to run
 the mksnapshot binary if it was built for arm or arm64.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 4a36ec8d550688a258aea35dbc05666ba8ee7f82..49ace170a574cfa2b76be59db29c6f5436824711 100644
+index 344a7fb5c5e54295fc7fd4f61780bdcf40bd6bd4..bdb82a0d813cb5abd612dc937135478911da25f3 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -1303,9 +1303,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
+@@ -1316,9 +1316,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
      ]
      public_deps = [
        ":natives_blob",

patches/common/v8/expose_mksnapshot.patch

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to build mksnapshot on arm.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 5c3b772c7b71c26b40ba7f69210bff57ed1198e6..f544888a6ee6f41e873b956c941a8d1ed3963128 100644
+index 65a82149f400d65ffd5c3be68bc4306e80b3cff7..5b3e0831c2657f4fa07adaa1de5fda6d2360c2ec 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -3472,8 +3472,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3514,8 +3514,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {