chore: bump chromium to 74.0.3729.27 (master) (#17345)

* chore: bump chromium to 74.0.3729.5 (master) * Remove ScopedBlockingCall constructor without location https://chromium-review.googlesource.com/c/chromium/src/+/1496560 * Use XCode 9.4.1 for Mac SDK 10.13 * chore: roll chromium 74.0.3729.27
2019-03-21 08:45:22 -07:00 · 2019-03-21 08:45:22 -07:00 · 6555be2636
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -22,12 +22,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge

 machine-mac: &machine-mac
  macos:
-    xcode: "8.3.3"
+    xcode: "9.4.1"

 machine-mac-large: &machine-mac-large
  resource_class: large
  macos:
-    xcode: "8.3.3"
+    xcode: "9.4.1"

 # Build configurations options.
 env-debug-build: &env-debug-build
@ -176,16 +176,6 @@ step-restore-brew-cache: &step-restore-brew-cache
    keys:
      - v1-brew-cache-{{ arch }}

-step-install-nodejs-on-mac: &step-install-nodejs-on-mac
-  run:
-    name: Install Node.js 10 on MacOS
-    command: |
-      if [ "`uname`" == "Darwin" ]; then
-        brew update
-        brew install node@10
-        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
-      fi
-
 # On macOS the npm install command during gclient sync was run on a linux
 # machine and therefore installed a slightly different set of dependencies
 # Notably "fsevents" is a macOS only dependency, we rerun npm install once
@ -546,7 +536,6 @@ steps-checkout: &steps-checkout
    - *step-depot-tools-get
    - *step-depot-tools-add-to-path
    - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
    - *step-install-gnutar-on-mac

    - restore_cache:
@ -618,7 +607,6 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
    - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
    - *step-install-npm-deps-on-mac
    - *step-fix-sync-on-mac
    - *step-gn-gen-default
@ -668,7 +656,6 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
    - *step-depot-tools-get
    - *step-depot-tools-add-to-path
    - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
    - *step-gclient-sync
    - *step-setup-env-for-build
    - *step-gn-gen-default
@ -802,7 +789,6 @@ steps-tests: &steps-tests
    - *step-mksnapshot-unzip
    - *step-setup-linux-for-headless-testing
    - *step-restore-brew-cache
-    - *step-install-nodejs-on-mac
    - *step-fix-known-hosts-linux

    - run:
--- a/2
+++ b/2
@ -10,7 +10,7 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '74.0.3724.8',
+    '74.0.3729.27',
  'node_version':
    '5e32b02e3c180c9997d60fe85042d335b6d9a588',

--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@ -126,14 +126,16 @@ std::unique_ptr<base::DictionaryValue> CreateFileSystemValue(
 }

 void WriteToFile(const base::FilePath& path, const std::string& content) {
-  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                base::BlockingType::WILL_BLOCK);
  DCHECK(!path.empty());

  base::WriteFile(path, content.data(), content.size());
 }

 void AppendToFile(const base::FilePath& path, const std::string& content) {
-  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                base::BlockingType::WILL_BLOCK);
  DCHECK(!path.empty());

  base::AppendToFile(path, content.data(), content.size());
--- a/atom/common/platform_util_win.cc
+++ b/atom/common/platform_util_win.cc
@ -231,7 +231,8 @@ HRESULT DeleteFileProgressSink::ResumeTimer() {
 }

 void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
-  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                base::BlockingType::MAY_BLOCK);
  base::win::ScopedCOMInitializer com_initializer;
  if (!com_initializer.Succeeded())
    return;
--- a/patches/common/chromium/.patches
+++ b/patches/common/chromium/.patches
@ -41,7 +41,6 @@ mas-cgdisplayusesforcetogray.patch
 mas-audiodeviceduck.patch
 mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
 allow_webview_file_url.patch
-enable_osr_components.patch
 ignore_rc_check.patch
 enable_widevine.patch
 chrome_key_systems.patch
@ -72,4 +71,3 @@ revert_build_swiftshader_for_arm32.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
-fix_build_on_arm.patch
--- a/patches/common/chromium/accelerator.patch
+++ b/patches/common/chromium/accelerator.patch
@ -9,9 +9,8 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 2. F2-F24 accelerators show up as such
 3. Ctrl-Shift-= should show as Ctrl-+

-
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index bf214d0b04ea5cf6711cd50618ad843bd054e538..7f245b1e8b9b3c5dc6666be4d74b69c86e80a351 100644
+index a59d08c79b315ad30dea3ce4fb67b59bba07fae7..7f245b1e8b9b3c5dc6666be4d74b69c86e80a351 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@
@ -48,7 +47,7 @@ index bf214d0b04ea5cf6711cd50618ad843bd054e538..7f245b1e8b9b3c5dc6666be4d74b69c8
 #if defined(OS_WIN)
     // Our fallback is to try translate the key code to a regular character
     // unless it is one of digits (VK_0 to VK_9). Some keyboard
-@@ -157,18 +164,14 @@ base::string16 Accelerator::GetShortcutText() const {
+@@ -157,21 +164,14 @@ base::string16 Accelerator::GetShortcutText() const {
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
@ -57,7 +56,10 @@ index bf214d0b04ea5cf6711cd50618ad843bd054e538..7f245b1e8b9b3c5dc6666be4d74b69c8
       key = static_cast<wchar_t>(key_code_);
 -    else
 -      key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
-    shortcut += key;
+-    // If there is no translation for the given |key_code_| (e.g.
+-    // VKEY_UNKNOWN), |::MapVirtualKeyW| returns 0.
+-    if (key != 0)
+-      shortcut += key;
 -#elif defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_ANDROID)
 -    const uint16_t c = DomCodeToUsLayoutCharacter(
 -        UsLayoutKeyboardCodeToDomCode(key_code_), false);
@ -73,7 +75,7 @@ index bf214d0b04ea5cf6711cd50618ad843bd054e538..7f245b1e8b9b3c5dc6666be4d74b69c8
   }
 
   // Checking whether the character used for the accelerator is alphanumeric.
-@@ -232,7 +235,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
+@@ -235,7 +235,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
   // more information.
   if (IsCtrlDown())
     shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);
--- a/patches/common/chromium/add_realloc.patch
+++ b/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 4a8ed5153449a668c810613fc384eb7952772db1..a426fb833c6b2ccc50f2738dab1764f0306a180f 100644
+index 061543362fa67972d79d651432a0b3223eb9a559..bbf403607369dccb115f681e09cc1070d80ba35c 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 {
--- a/patches/common/chromium/blink_file_path.patch
+++ b/patches/common/chromium/blink_file_path.patch
@ -7,7 +7,7 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object

 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 474c226bcd74a4f9d0d3e2bc2373ccfb1970fc24..5ee32f4b4ffebe4a9824726d2f06f509ded9dcb5 100644
+index 6ae1e8ed179717d630518eeddd1a6c453139605d..a7167220fa0bc93ee845bb1a48a65c49f137e6fe 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
@@ -202,6 +202,9 @@ class CORE_EXPORT File final : public Blob {
--- a/patches/common/chromium/blink_initialization_order.patch
+++ b/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 ea4d47ef7ed58f2be638a6fbae7c12e1ee5b4c77..c02e5fcf72486600702a5ac39af2a13c1b255b4b 100644
+index a56856c704ec7fa65d560a8604d7303be707a1ac..127a4e2dbf5984bb3512e426350d648e1d4837ab 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
-@@ -202,11 +202,10 @@ void LocalWindowProxy::Initialize() {
+@@ -200,11 +200,10 @@ void LocalWindowProxy::Initialize() {
                  GetFrame()->IsMainFrame());
     MainThreadDebugger::Instance()->ContextCreated(script_state_, GetFrame(),
                                                    origin);
--- a/patches/common/chromium/blink_local_frame.patch
+++ b/patches/common/chromium/blink_local_frame.patch
@ -14,7 +14,7 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.

 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index d696925e6f5dae9ca6406a15766826ee8e42475c..f592b0e7fa3c32d66dd0247e1492a973a1583d59 100644
+index a7b483e821fe73f4d725ae21b3182778024c5bed..aed4b5e3c72857173868b20a85cd341bcc990d2b 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -409,10 +409,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
--- a/patches/common/chromium/blink_world_context.patch
+++ b/patches/common/chromium/blink_world_context.patch
@ -19,10 +19,10 @@ index fa0fca68d181f6783bb88e99f42697d5efbd3a49..93630884c3a3a4441645d76742796322
   // 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 699af61cbfc80a0e88ccf692c0a4eccca12b0c8a..68fbdd861dc991bf1ab91775336e7a9f6889a0a7 100644
+index 6f19b08f41cf815e17d1d97870f5936771b8794c..9bc16c70f52e03e7f1c277c60f4aac802856d226 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
-@@ -891,6 +891,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -864,6 +864,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
   return MainWorldScriptContext()->Global();
 }
 
--- a/patches/common/chromium/boringssl_build_gn.patch
+++ b/patches/common/chromium/boringssl_build_gn.patch
@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.

 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index 051b3ed07fa7d4ec2e5f9200dab6843176e55d56..edf567e79c88fbe66acf4aabd3952cb8adcab4af 100644
+index e50f30a4763ee834564a2f91e0b6b0543138d6e5..5262a59d413fc9944e164a7e269fee431361b5bd 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
@@ -45,6 +45,19 @@ config("no_asm_config") {
--- a/patches/common/chromium/can_create_window.patch
+++ b/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 ca7881b3b3cd06b9dc89abc477d560a288fe5423..69081399bf0f746a0fd447ac5f8ec360664195ad 100644
+index a50837cb5b78b72ca5271940e13685885b947e0b..3d4862d257a8758d69b778c807499032be000e50 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -3654,6 +3654,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -3694,6 +3694,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,
@ -17,10 +17,10 @@ index ca7881b3b3cd06b9dc89abc477d560a288fe5423..69081399bf0f746a0fd447ac5f8ec360
           &no_javascript_access);
 
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index f660470b2c612f89a3ad9f0ada4ab13710705b57..45c38198e8fcc44d71ef9440e38d301f8d4951a3 100644
+index 16a30995a0e20b1a32a418be5a44f1e3c2305cee..637ed8e1ee82cf1cacfedaf142fccc7d63ae98d6 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -229,6 +229,10 @@ struct CreateNewWindowParams {
+@@ -261,6 +261,10 @@ struct CreateNewWindowParams {
 
   // The window features to use for the new window.
   blink.mojom.WindowFeatures features;
@ -32,10 +32,10 @@ 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 b37de5fbf84131cdcb2ee073e746fb18f0f1fc35..b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a 100644
+index f60a65efffe1dbf7850063b0c8f236bc94841dfd..798a62cbb030514ce2373f898d9680ceda7b9062 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -501,6 +501,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -506,6 +506,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@ -45,7 +45,7 @@ index b37de5fbf84131cdcb2ee073e746fb18f0f1fc35..b6c528126bde8c7ee8cdf8440ae51cfe
     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 7fc0a70f4e79544a9cc8dfcc1fa5f670261c4e56..72944bc96a2ec71be1b20fa68e7994445f225824 100644
+index 9ed297dba6d9005e2183c9d7ec35f0389ea1ec70..5a6d3cbf0a913f56a789ac1166d850eb29332a78 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
@@ -175,6 +175,7 @@ class RenderFrameHost;
@ -56,7 +56,7 @@ index 7fc0a70f4e79544a9cc8dfcc1fa5f670261c4e56..72944bc96a2ec71be1b20fa68e799444
 class SerialDelegate;
 class ServiceManagerConnection;
 class SiteInstance;
-@@ -775,6 +776,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -778,6 +779,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@ -66,7 +66,7 @@ index 7fc0a70f4e79544a9cc8dfcc1fa5f670261c4e56..72944bc96a2ec71be1b20fa68e799444
       bool opener_suppressed,
       bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 91c52f9d202efd6232ac602e5dc847737695471d..b71bbc613bdd573546b2cfa89b98220a434169c5 100644
+index c748edbf5a3264c89b83a88ade3449ce472839ad..6452ef002ce63936f5321bf755f47408f59d0207 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
@@ -76,6 +76,7 @@
@ -77,7 +77,7 @@ index 91c52f9d202efd6232ac602e5dc847737695471d..b71bbc613bdd573546b2cfa89b98220a
 #include "content/renderer/media/audio/audio_device_factory.h"
 #include "content/renderer/media/stream/media_stream_device_observer.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
-@@ -1346,6 +1347,8 @@ WebView* RenderViewImpl::CreateView(
+@@ -1354,6 +1355,8 @@ WebView* RenderViewImpl::CreateView(
   }
   params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
 
--- a/patches/common/chromium/command-ismediakey.patch
+++ b/patches/common/chromium/command-ismediakey.patch
@ -46,7 +46,7 @@ index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e519
 GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
-index eb58c51eb768bb013e293649e0308786c5482e21..e469e5115fce12fe5d382bd75d9c6f41fa24293e 100644
+index f5d0ac4ba826ee4f023224ce90c6d8b6614c2912..2dac08bf9fb46beed57484636c9304ceaea347fc 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc
 +++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
@ -80,10 +80,10 @@ index 392cf3d58c64c088596e8d321a2ce37b0ec60b6e..43e30f47240dc10a3a9b950255d4e487
   ui::Accelerator accelerator(
       ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index fe6aa25cc8cc372ef450e5d6658a52a2b87eabcb..e960d601062b644c0b25b657e128e06584c45b54 100644
+index 71b417ee8b64aa2ff7f1b2390851668ec1dcd7cf..1768af408d4cc3075e5bae046649e4955cc400b3 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
-@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
+@@ -33,6 +33,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
     case NX_KEYTYPE_NEXT:
     case NX_KEYTYPE_FAST:
       return VKEY_MEDIA_NEXT_TRACK;
@ -96,7 +96,7 @@ index fe6aa25cc8cc372ef450e5d6658a52a2b87eabcb..e960d601062b644c0b25b657e128e065
   }
   return VKEY_UNKNOWN;
 }
-@@ -191,7 +197,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
+@@ -192,7 +198,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 &&
--- a/patches/common/chromium/compositor_delegate.patch
+++ b/patches/common/chromium/compositor_delegate.patch
@ -5,10 +5,10 @@ Subject: compositor_delegate.patch


 diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
-index bc1934e2c7b40595b0c06d9beace5f4a569e7751..a354265c235bc8c81f3e5ab5b703bf6c7af06187 100644
+index 4768ac1a3bac8dee0b146d2ad30a50c6aee330c4..531c862a7a01bd74775621115fade56025cd15c6 100644
 --- a/content/browser/compositor/gpu_process_transport_factory.cc
 +++ b/content/browser/compositor/gpu_process_transport_factory.cc
-@@ -451,11 +451,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
+@@ -452,11 +452,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
       // surfaces as they are not following the correct mode.
       DisableGpuCompositing(compositor.get());
     }
--- a/patches/common/chromium/content_browser_main_loop.patch
+++ b/patches/common/chromium/content_browser_main_loop.patch
@ -8,10 +8,10 @@ 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 368011e73ad29bbfdbd2a6d4828ce7635e1929ca..8da6c457e639b3fd0cd5352735cdc7299f682455 100644
+index c964fa664130a1a1694cbe876df0d47d17f5818c..d9711114839e7b68ee4fe71590854833d8302b28 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1544,7 +1544,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1547,7 +1547,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
   }
 
   base::RunLoop run_loop;
--- a/patches/common/chromium/cross_site_document_resource_handler.patch
+++ b/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 8a4f94786e75c7abecd1a53fd6f0c2c0421534db..204637b78b36b3fb0d21804295b4de73a295de5d 100644
+index 337bb0ed74b3efe7ae0bcb6ea8ef662becb0cabd..a3dcd9c097254fa7b9f7278f6e960be27cfbd133 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 8a4f94786e75c7abecd1a53fd6f0c2c0421534db..204637b78b36b3fb0d21804295b4de73
     const MainFunctionParams& parameters) {
   return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index bbc4263798a4cf13c0a6f3d7d62f01eb1dfe4784..1551bbad5e1a30fe6e83f85d9f66a4b18bc1bca1 100644
+index 3dfe4abcc76b88580d818ea1bd61a0e32c0af882..924d9da7d9f6bd6b1adc1aa2d286f3cc998efdce 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 {
--- a/patches/common/chromium/dcheck.patch
+++ b/patches/common/chromium/dcheck.patch
@ -17,10 +17,10 @@ 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 71a0a5ffb4ba7a371d418a52b2eb605140aefbe6..f15f121244890bd9d024e3c9aa83dc1ca796088d 100644
+index 90cfe806ba0bef2182f7a1cc7ad02c0010dc2136..e702bf2151aa9f6c3b1981ad9725d1d814494a31 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(
+@@ -1201,8 +1201,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
     return NAVIGATION_TYPE_NEW_SUBFRAME;
   }
 
@ -33,7 +33,7 @@ index 71a0a5ffb4ba7a371d418a52b2eb605140aefbe6..f15f121244890bd9d024e3c9aa83dc1c
 
   if (rfh->GetParent()) {
     // All manual subframes would be did_create_new_entry and handled above, so
-@@ -1428,7 +1430,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
+@@ -1445,7 +1447,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
     new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
   }
 
--- a/patches/common/chromium/disable_color_correct_rendering.patch
+++ b/patches/common/chromium/disable_color_correct_rendering.patch
@ -18,21 +18,6 @@ This can be removed once web content (including WebGL) learn how
 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 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(
- }
- 
- RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const {
-+  if (!settings_.enable_color_correct_rendering) {
-+    return {};
-+  }
-+
-   RasterColorSpace result;
-   // 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 04e48714a6f4fcf980f91d75e319667dc0ee18a4..0ec60a0bf9f903de67f69422f22b674bb3a49798 100644
 --- a/cc/trees/layer_tree_settings.h
@ -80,7 +65,7 @@ index ee1f83f4d3db713f64c4175615be816198ea44a1..446df2e9b84565677ae6389339129187
       !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 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40918a0386 100644
+index 9e0979a93d698665b08623ad7cbc11939d7f4ff8..93f99b09250ab1f515e13de3ac80cea1ab71a08f 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
@@ -79,6 +79,9 @@
@ -115,7 +100,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 }
 
 void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -1794,8 +1799,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -1797,8 +1802,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 +111,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
   SetShaderColor(color, opacity);
 
   if (current_program_->tint_color_matrix_location() != -1) {
-@@ -1945,8 +1950,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
+@@ -1948,8 +1953,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
                        quad->is_premultiplied ? PREMULTIPLIED_ALPHA
                                               : NON_PREMULTIPLIED_ALPHA,
                        false, false, tint_gl_composited_content_),
@ -137,7 +122,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   if (current_program_->tint_color_matrix_location() != -1) {
     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2037,8 +2042,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
+@@ -2040,8 +2045,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
                                               : NON_PREMULTIPLIED_ALPHA,
                        !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
                        tint_gl_composited_content_),
@ -148,7 +133,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   if (current_program_->tint_color_matrix_location() != -1) {
     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2136,7 +2141,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
+@@ -2139,7 +2144,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
   DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
 
   gfx::ColorSpace dst_color_space =
@ -157,7 +142,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
   // 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.
-@@ -2284,8 +2289,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
+@@ -2287,8 +2292,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
                                                  quad->resource_id());
 
   SetUseProgram(ProgramKey::VideoStream(tex_coord_precision),
@ -168,7 +153,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
   gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2342,8 +2347,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
+@@ -2345,8 +2350,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
       draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
 
   // Bind the program to the GL state.
@ -179,7 +164,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
   gl_->BindTexture(locked_quad.target(), locked_quad.texture_id());
-@@ -2998,7 +3003,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
+@@ -3001,7 +3006,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 +175,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   ProgramKey program_key = program_key_no_color;
   const gfx::ColorTransform* color_transform =
-@@ -3352,7 +3359,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -3355,7 +3362,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
 
   *overlay_texture = FindOrCreateOverlayTexture(
       params.quad->render_pass_id, iosurface_width, iosurface_height,
@ -199,7 +184,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
   *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                            gfx::SizeF((*overlay_texture)->texture.size()));
 
-@@ -3556,8 +3563,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -3559,8 +3566,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
 
   PrepareGeometry(SHARED_BINDING);
 
@ -211,7 +196,7 @@ index 758b76453b4bc0728870013ecba6d2e770609b6b..62ac5d810c94adc8d29e5a6cf0854c40
 
   gfx::Transform render_matrix;
   render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -3717,3 +3725,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
+@@ -3720,3 +3728,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
 }
 
 }  // namespace viz
@ -230,7 +215,7 @@ index e43e5f6bb667a62e7e1205e8da6073de6179e79f..027a552cfbfce3f4f8fe5670bec7db45
     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 17edbd3a08010f257152e857a178af83c9aaf3d6..dbd8c3066b61b38b43cc2bd439aa954cc06f9039 100644
+index 2588bbfa0f90f7e2204e9d544c8cc562396ae9ad..d21a7911db396682640e0ce9a5d8961f82a7b69f 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -220,6 +220,7 @@
@ -241,7 +226,7 @@ index 17edbd3a08010f257152e857a178af83c9aaf3d6..dbd8c3066b61b38b43cc2bd439aa954c
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_features.h"
 
-@@ -2951,6 +2952,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -2953,6 +2954,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,7 +235,7 @@ index 17edbd3a08010f257152e857a178af83c9aaf3d6..dbd8c3066b61b38b43cc2bd439aa954c
     network::switches::kExplicitlyAllowedPorts,
     service_manager::switches::kDisableInProcessStackTraces,
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
-index 7c243ad046a6cd7fa37f7c12878cb05fb2c70d24..a3efbf63e54da43ca6f70edc067678fa5c2cca92 100644
+index fc68491562ad7a4d3c9d81942740ccf6a4ad1453..21ef29b70f47e65b8d1136c6578b9e15a1665743 100644
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
@@ -2771,6 +2771,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
--- a/patches/common/chromium/disable_hidden.patch
+++ b/patches/common/chromium/disable_hidden.patch
@ -5,7 +5,7 @@ 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 bb1096d28ceb4117b582d7dde2f57c3317120716..61273d7aaac07635ee3497ce16af8a9e0d6f1ed8 100644
+index 2e7577d87f0ae54f7390c4dc6ceb874367c41758..c716ef9a9f0f4bcaa080cd4af2702c3c2e406795 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -765,6 +765,9 @@ void RenderWidgetHostImpl::WasHidden() {
--- a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
+++ b/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 1d04d162342dafb337b014aad562cb452eddc6d4..2ba36366853b1a0435900a5946757c4bf5a92a6a 100644
+index 6925a13ceab4265016a5c22a25cb9476bbcf95dd..8c8937b4b203a1e0fa400bc9840bc51949ae2b30 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -3689,7 +3689,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
+@@ -3682,7 +3682,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);
--- a/patches/common/chromium/dom_storage_limits.patch
+++ b/patches/common/chromium/dom_storage_limits.patch
@ -79,7 +79,7 @@ index 13bcf8e3f2882999e073d0c7ac6d8f1627f0bfa2..6d330cd1de358b477df4c1fed4d814c2
   PrimeIfNeeded(connection_id);
   base::NullableString16 old_value;
 diff --git a/content/renderer/dom_storage/local_storage_cached_area.cc b/content/renderer/dom_storage/local_storage_cached_area.cc
-index 1b406b322f6de52d808b021015c656f60700645e..8bc713a723569e9d28212d68a0b2a22cd2bcc6c0 100644
+index c04e0e8bff1a7a41a1e18aca5403aed16a80aead..d63cec971f0a98f7b8ff30c1f6a0fa843efbecfa 100644
 --- a/content/renderer/dom_storage/local_storage_cached_area.cc
 +++ b/content/renderer/dom_storage/local_storage_cached_area.cc
@@ -142,11 +142,13 @@ bool LocalStorageCachedArea::SetItem(const base::string16& key,
@ -97,10 +97,10 @@ index 1b406b322f6de52d808b021015c656f60700645e..8bc713a723569e9d28212d68a0b2a22c
   EnsureLoaded();
   bool result = false;
 diff --git a/third_party/blink/renderer/modules/storage/cached_storage_area.cc b/third_party/blink/renderer/modules/storage/cached_storage_area.cc
-index 21ce9fe01d3a125055fe3c3f29cc89ecf014944f..3ecdfe1011113ddaecbad1766cd8044366a9e47f 100644
+index 35a114eb8fc2ee6176c25377081df7f04f8b72f1..689df99ebd955e544bbc1e3048842801fb9c5367 100644
 --- a/third_party/blink/renderer/modules/storage/cached_storage_area.cc
 +++ b/third_party/blink/renderer/modules/storage/cached_storage_area.cc
-@@ -102,11 +102,13 @@ bool CachedStorageArea::SetItem(const String& key,
+@@ -101,11 +101,13 @@ bool CachedStorageArea::SetItem(const String& key,
                                 Source* source) {
   DCHECK(areas_->Contains(source));
 
--- a/patches/common/chromium/enable_osr_components.patch
+++ b/patches/common/chromium/enable_osr_components.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Thu, 20 Sep 2018 17:49:52 -0700
-Subject: enable_osr_components.patch
-
-Add MouseWheelPhaseHandler for OSR.
-
-diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
-index fc252b6ceffd92e85f545f848bb8bde4e518cbd9..b0dfd847ec03ca7843d2c1c217b172213bed097c 100644
--- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
-+++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
-@@ -7,6 +7,7 @@
- 
- #include "base/timer/timer.h"
- #include "content/browser/renderer_host/render_widget_host_delegate.h"
-+#include "content/common/content_export.h"
- #include "content/public/common/input_event_ack_state.h"
- #include "third_party/blink/public/platform/web_mouse_wheel_event.h"
- 
-@@ -55,7 +56,7 @@ enum class FirstScrollUpdateAckState {
- // The MouseWheelPhaseHandler is responsible for adding the proper phase to
- // wheel events. Phase information is necessary for wheel scrolling since it
- // shows the start and end of a scrolling sequence.
-class MouseWheelPhaseHandler {
-+class CONTENT_EXPORT MouseWheelPhaseHandler {
-  public:
-   MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view);
-   ~MouseWheelPhaseHandler() {}
--- a/patches/common/chromium/exclude-a-few-test-files-from-build.patch
+++ b/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 fef425f94edcd483efaa16c33b642636a19071ed..8079c15fd65fa08049360dce6d1f5ce1b9aca8a9 100644
+index 77b4b56becc7a0d6b2cc056f08adbe3459dae131..38f42acf2b7e97a4867b9b1064b3782eaf80a0c6 100644
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1729,7 +1729,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
+@@ -1734,7 +1734,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",
--- a/patches/common/chromium/fix_build_on_arm.patch
+++ b/patches/common/chromium/fix_build_on_arm.patch
@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Tue, 5 Mar 2019 11:12:55 -0800
-Subject: fix: build on arm
-
-backports https://chromium-review.googlesource.com/c/chromium/src/+/1496448
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 55394a791a54a2650fa2e1ed4d4e293b940d8fa2..68ce32a136ccc5130e3544b67dfb4af5c8b47a56 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -34,12 +34,14 @@
- #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(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
-+    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
- // 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.
-+// asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-+// defined on aarch64, so don't try to include this on those platforms.
- #include <asm/ptrace-abi.h>
-#endif  // !PTRACE_GET_THREAD_AREA && OS_LINUX && !OS_CHROMEOS
-+#endif
- #endif  // !OS_NACL_NONSFI
- 
- #if defined(OS_ANDROID)
--- a/patches/common/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
+++ b/patches/common/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
@ -4,9 +4,8 @@ Date: Mon, 4 Mar 2019 14:46:48 -0800
 Subject: fix: disable usage of pthread_fchdir_np and pthread_chdir_np in MAS
 builds

-
 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index 6c0e14fc3332c27309c83137cff9f060ed306aea..2f77af0cafbc0122603bc2735f6327e2e42a07b6 100644
+index a72c9f18f60293ba33a2007f28def704bc3c2f1b..b397584be8b518bd9800f63fd3a523298911b122 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
@@ -24,10 +24,12 @@
--- a/patches/common/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
+++ b/patches/common/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
@ -4,12 +4,11 @@ Date: Mon, 4 Mar 2019 14:51:45 -0800
 Subject: fix: disable usage of SetApplicationIsDaemon and
 _LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds

-
 diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
-index 4450cc711772c600f138acb5458eb8ab0801ecf5..58e81aac8f8c97e5a3b3cd32b4d95789e14d2d31 100644
+index b8bc22e665f803aa455a8d3f270e3fd2141b2a9c..79c92be87aedf605803501d98a5a1952fa36e586 100644
 --- a/content/utility/utility_service_factory.cc
 +++ b/content/utility/utility_service_factory.cc
-@@ -195,7 +195,7 @@ void UtilityServiceFactory::RunNetworkServiceOnIOThread(
+@@ -202,7 +202,7 @@ void UtilityServiceFactory::RunNetworkServiceOnIOThread(
 std::unique_ptr<service_manager::Service>
 UtilityServiceFactory::CreateAudioService(
     service_manager::mojom::ServiceRequest request) {
--- a/patches/common/chromium/frame_host_manager.patch
+++ b/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 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693fce8dec9b 100644
+index cc7c7b4ffab5377fa71016e233fbfaae87d50329..81a351569528e74fa44e68a804de968bc3a08742 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
-@@ -2031,6 +2031,16 @@ bool RenderFrameHostManager::InitRenderView(
+@@ -2030,6 +2030,16 @@ bool RenderFrameHostManager::InitRenderView(
 scoped_refptr<SiteInstance>
 RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
     const NavigationRequest& request) {
@ -27,7 +27,7 @@ index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
   // 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();
-@@ -2063,6 +2073,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2062,6 +2072,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
                                               request.common_params().url);
     no_renderer_swap_allowed |=
         request.from_begin_navigation() && !can_renderer_initiate_transfer;
@ -79,7 +79,7 @@ index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
   } else {
     // Subframe navigations will use the current renderer, unless specifically
     // allowed to swap processes.
-@@ -2074,23 +2129,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2073,23 +2128,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 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
 }
 
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a..8a4f94786e75c7abecd1a53fd6f0c2c0421534db 100644
+index 798a62cbb030514ce2373f898d9680ceda7b9062..337bb0ed74b3efe7ae0bcb6ea8ef662becb0cabd 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 b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a..8a4f94786e75c7abecd1a53fd6f0c2c0
     const MainFunctionParams& parameters) {
   return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 72944bc96a2ec71be1b20fa68e7994445f225824..bbc4263798a4cf13c0a6f3d7d62f01eb1dfe4784 100644
+index 5a6d3cbf0a913f56a789ac1166d850eb29332a78..3dfe4abcc76b88580d818ea1bd61a0e32c0af882 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(
--- a/patches/common/chromium/mas_no_private_api.patch
+++ b/patches/common/chromium/mas_no_private_api.patch
@ -38,10 +38,10 @@ index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109
 // is concerned.
 @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c04132be61fb 100644
+index 9b8e15866a325faee845a97f0e5a2f14e343d2f6..148d5fdd3f11ab318f6a0d0add23bd4533b47ed9 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
-@@ -140,6 +140,7 @@
+@@ -141,6 +141,7 @@
 // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
 const int kAXResultsLimitNoLimit = -1;
 
@ -49,15 +49,15 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 extern "C" {
 
 // The following are private accessibility APIs required for cursor navigation
-@@ -344,6 +345,7 @@ void AddMisspelledTextAttributes(
+@@ -345,6 +346,7 @@ void AddMisspelledTextAttributes(
   AddMisspelledTextAttributes(text_only_objects, attributed_text);
   return [attributed_text attributedSubstringFromRange:range];
 }
 +#endif
 
 // Returns an autoreleased copy of the AXNodeData's attribute.
- NSString* NSStringForStringAttribute(
-@@ -613,7 +615,9 @@ + (void)initialize {
+ NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
+@@ -612,7 +614,9 @@ + (void)initialize {
       {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
       {NSAccessibilityElementBusyAttribute, @"elementBusy"},
       {NSAccessibilityEnabledAttribute, @"enabled"},
@ -67,7 +67,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
       {NSAccessibilityExpandedAttribute, @"expanded"},
       {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
       {NSAccessibilityFocusedAttribute, @"focused"},
-@@ -648,13 +652,17 @@ + (void)initialize {
+@@ -647,13 +651,17 @@ + (void)initialize {
       {NSAccessibilityRowsAttribute, @"rows"},
       // TODO(aboxhall): expose
       // NSAccessibilityServesAsTitleForUIElementsAttribute
@ -85,7 +85,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
       {NSAccessibilitySizeAttribute, @"size"},
       {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
       {NSAccessibilitySubroleAttribute, @"subrole"},
-@@ -1143,6 +1151,7 @@ - (NSNumber*)enabled {
+@@ -1142,6 +1150,7 @@ - (NSNumber*)enabled {
                                   ax::mojom::Restriction::kDisabled];
 }
 
@ -93,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 {
-@@ -1153,6 +1162,7 @@ - (id)endTextMarker {
+@@ -1152,6 +1161,7 @@ - (id)endTextMarker {
   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
 }
@ -101,7 +101,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 
 - (NSNumber*)expanded {
   if (![self instanceActive])
-@@ -2036,6 +2046,7 @@ - (NSValue*)selectedTextRange {
+@@ -2035,6 +2045,7 @@ - (NSValue*)selectedTextRange {
   return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
 }
 
@ -109,7 +109,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 - (id)selectedTextMarkerRange {
   if (![self instanceActive])
     return nil;
-@@ -2068,6 +2079,7 @@ - (id)selectedTextMarkerRange {
+@@ -2067,6 +2078,7 @@ - (id)selectedTextMarkerRange {
                                                anchorAffinity, *focusObject,
                                                focusOffset, focusAffinity));
 }
@ -117,7 +117,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 
 - (NSValue*)size {
   if (![self instanceActive])
-@@ -2100,6 +2112,7 @@ - (NSString*)sortDirection {
+@@ -2099,6 +2111,7 @@ - (NSString*)sortDirection {
   return nil;
 }
 
@ -125,15 +125,15 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 // Returns a text marker that points to the first character in the document that
 // can be selected with VoiceOver.
 - (id)startTextMarker {
-@@ -2110,6 +2123,7 @@ - (id)startTextMarker {
+@@ -2109,6 +2122,7 @@ - (id)startTextMarker {
   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
 }
 +#endif
 
 // Returns a subrole based upon the role.
- - (NSString*) subrole {
-@@ -2415,12 +2429,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
+ - (NSString*)subrole {
+@@ -2414,12 +2428,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
   NSMutableAttributedString* attributedValue =
       [[[NSMutableAttributedString alloc] initWithString:value] autorelease];
 
@ -148,7 +148,7 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
 
   return [attributedValue attributedSubstringFromRange:range];
 }
-@@ -2506,6 +2522,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2504,6 +2520,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
       return ToBrowserAccessibilityCocoa(cell);
   }
 
@ -156,23 +156,23 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
   if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
     BrowserAccessibilityPositionInstance position =
         CreatePositionFromTextMarker(parameter);
-@@ -2683,6 +2700,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2681,6 +2698,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     NSString* text = GetTextForTextMarkerRange(parameter);
     return [NSNumber numberWithInt:[text length]];
   }
 +#endif
 
   if ([attribute isEqualToString:
-       NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -2716,6 +2734,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+                      NSAccessibilityBoundsForRangeParameterizedAttribute]) {
+@@ -2714,6 +2732,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     return nil;
   }
 
 +#ifndef MAS_BUILD
-   if ([attribute isEqualToString:
-            NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-     BrowserAccessibilityPositionInstance position =
-@@ -2791,6 +2810,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
+   if ([attribute
+           isEqualToString:
+               NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
+@@ -2793,6 +2812,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
 
     return @(child->GetIndexInParent());
   }
@ -181,10 +181,10 @@ index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c041
   return nil;
 }
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index 7fe7130abd6a4844dd503b9cee198c8204cb0985..3e6b0ad576d3aa9951f84f6ce4175d84ffd67036 100644
+index 2a1ad6a78e90ea8b84630bcefeacab7cf9ec7a05..fced3606ea1a3746554ee7bfbf80fec3dad46c37 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-@@ -464,6 +464,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -460,6 +460,7 @@ void PostAnnouncementNotification(NSString* announcement) {
       [user_info setObject:native_focus_object
                     forKey:NSAccessibilityTextChangeElement];
 
@ -192,7 +192,7 @@ index 7fe7130abd6a4844dd503b9cee198c8204cb0985..3e6b0ad576d3aa9951f84f6ce4175d84
       id selected_text = [native_focus_object selectedTextMarkerRange];
       if (selected_text) {
         NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-@@ -471,6 +472,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -467,6 +468,7 @@ void PostAnnouncementNotification(NSString* announcement) {
         [user_info setObject:selected_text
                       forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
       }
--- a/patches/common/chromium/notification_provenance.patch
+++ b/patches/common/chromium/notification_provenance.patch
@ -6,10 +6,10 @@ 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 7c6b38b94d714ec2a878ce3cf0448028fbf7c19b..f26dd52579544ad030b603a16ef0ff03ecebb42a 100644
+index f251139f5976d4ff52ac4d0f89a2c627c1809c8a..457890dcb49ca59c61326c633d74eabcf999ff08 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(
+@@ -71,9 +71,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
     PlatformNotificationContextImpl* notification_context,
     BrowserContext* browser_context,
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
@ -21,7 +21,7 @@ index 7c6b38b94d714ec2a878ce3cf0448028fbf7c19b..f26dd52579544ad030b603a16ef0ff03
       browser_context_(browser_context),
       service_worker_context_(std::move(service_worker_context)),
       origin_(origin),
-@@ -112,7 +114,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
+@@ -133,7 +135,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
       notification_id, std::move(event_listener_ptr));
 
   GetNotificationService()->DisplayNotification(
@ -51,10 +51,10 @@ index 088637b68b1fb40fb8a32bb72781b425077e668a..ec2cce6b644e6cc8fd899a761fb55d9a
 
   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 759e317999ec4f37f185310724374c655c2f24fe..874f6d1fb6d2bddc0e6711080adfadc3f7156b0e 100644
+index a2fb2bbd8761b0c0078fbde0999f4f8f434c4a35..e68613c4a4c6b05694514071c7dc2e0c4419d141 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 {
+@@ -130,7 +130,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
 
     notification_service_ = std::make_unique<BlinkNotificationServiceImpl>(
         notification_context_.get(), &browser_context_,
@ -64,10 +64,10 @@ index 759e317999ec4f37f185310724374c655c2f24fe..874f6d1fb6d2bddc0e6711080adfadc3
         mojo::MakeRequest(&notification_service_ptr_));
 
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index d78bd8005178dea2dd3985527de4709e28b1ac3e..11d82930e851975997fcc69f623c4ec154f83dcc 100644
+index 9d43b4e8cbd0238fdcde03e31537a68c4edb9471..ba5a87e8fca4680e7acd173111d5882a8f0667f9 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
-@@ -108,12 +108,13 @@ void PlatformNotificationContextImpl::Shutdown() {
+@@ -178,12 +178,13 @@ void PlatformNotificationContextImpl::Shutdown() {
 }
 
 void PlatformNotificationContextImpl::CreateService(
@ -84,10 +84,10 @@ index d78bd8005178dea2dd3985527de4709e28b1ac3e..11d82930e851975997fcc69f623c4ec1
 
 void PlatformNotificationContextImpl::RemoveService(
 diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
-index 09fd40b0a55a9799dc8018ea69a85cb25724fa63..143335b6ba90b0d0aef8aa95687db1dbcc2bdf79 100644
+index c7c9bc8fb304697bb1802d04e26038c65b8facdc..e73d2b0a276d4a0a7d1a484d11d5ac43d963cc77 100644
 --- a/content/browser/notifications/platform_notification_context_impl.h
 +++ b/content/browser/notifications/platform_notification_context_impl.h
-@@ -22,6 +22,7 @@
+@@ -25,6 +25,7 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/platform_notification_context.h"
@ -95,7 +95,7 @@ index 09fd40b0a55a9799dc8018ea69a85cb25724fa63..143335b6ba90b0d0aef8aa95687db1db
 #include "third_party/blink/public/platform/modules/notifications/notification_service.mojom.h"
 
 class GURL;
-@@ -62,7 +63,8 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
+@@ -66,7 +67,8 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
   void Shutdown();
 
   // Creates a BlinkNotificationServiceImpl that is owned by this context.
--- a/patches/common/chromium/out_of_process_instance.patch
+++ b/patches/common/chromium/out_of_process_instance.patch
@ -5,10 +5,10 @@ Subject: out_of_process_instance.patch


 diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
-index 25bb9fdd9b5c4cedccd401ca24d75807ddd77842..38987a29fdccbf1d4740779157b296cd4ea46cb2 100644
+index f7242db52cc68c43c11c9c15b3ada59c33c385e3..41b6bfd050b8ec2150a4ba05d8a3cc40a7962e20 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,
+@@ -464,7 +464,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
   std::string document_url = document_url_var.AsString();
   base::StringPiece document_url_piece(document_url);
   is_print_preview_ = IsPrintPreviewUrl(document_url_piece);
--- a/patches/common/chromium/printing.patch
+++ b/patches/common/chromium/printing.patch
@ -283,10 +283,10 @@ index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..a827091facdb4f6b1d74ce826c3492ce
 // Like PrintMsg_PrintPages, but using the print preview document's frame/node.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf33b378a0 100644
+index 40ea9d21b07a04fc9b32adf4c24106506afb3e2e..1ba13510f24659040e8a99c5399e6de899d90965 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
-@@ -1109,7 +1109,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1108,7 +1108,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
     web_frame->DispatchBeforePrintEvent();
     if (!weak_this)
       return;
@ -297,7 +297,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
     if (weak_this)
       web_frame->DispatchAfterPrintEvent();
   }
-@@ -1157,7 +1159,10 @@ void PrintRenderFrameHelper::OnDestruct() {
+@@ -1156,7 +1158,10 @@ void PrintRenderFrameHelper::OnDestruct() {
   delete this;
 }
 
@ -309,7 +309,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   if (ipc_nesting_level_ > 1)
     return;
 
-@@ -1170,7 +1175,8 @@ void PrintRenderFrameHelper::OnPrintPages() {
+@@ -1169,7 +1174,8 @@ void PrintRenderFrameHelper::OnPrintPages() {
   // If we are printing a PDF extension frame, find the plugin node and print
   // that instead.
   auto plugin = delegate_->GetPdfElement(frame);
@ -319,7 +319,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   if (weak_this)
     frame->DispatchAfterPrintEvent();
   // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1187,7 +1193,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() {
+@@ -1186,7 +1192,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() {
   }
   auto weak_this = weak_ptr_factory_.GetWeakPtr();
   Print(frame, print_preview_context_.source_node(),
@ -328,7 +328,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   if (weak_this)
     frame->DispatchAfterPrintEvent();
   // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1223,6 +1229,8 @@ void PrintRenderFrameHelper::OnPrintPreview(
+@@ -1222,6 +1228,8 @@ void PrintRenderFrameHelper::OnPrintPreview(
   if (ipc_nesting_level_ > 1)
     return;
 
@ -337,7 +337,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   print_preview_context_.OnPrintPreview();
 
   UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
-@@ -1616,7 +1624,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1615,7 +1623,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
 
     auto self = weak_ptr_factory_.GetWeakPtr();
     Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -349,7 +349,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
     // Check if |this| is still valid.
     if (!self)
       return;
-@@ -1627,7 +1638,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1626,7 +1637,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
 
 void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                    const blink::WebNode& node,
@ -361,7 +361,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   // If still not finished with earlier print request simply ignore.
   if (prep_frame_view_)
     return;
-@@ -1635,7 +1649,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1634,7 +1648,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
   FrameReference frame_ref(frame);
 
   int expected_page_count = 0;
@ -370,7 +370,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
     DidFinishPrinting(FAIL_PRINT_INIT);
     return;  // Failed to init print page settings.
   }
-@@ -1655,8 +1669,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1654,8 +1668,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
 
     PrintMsg_PrintPages_Params print_settings;
     auto self = weak_ptr_factory_.GetWeakPtr();
@ -382,7 +382,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
     // Check if |this| is still valid.
     if (!self)
       return;
-@@ -1666,6 +1681,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1665,6 +1680,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
             ? blink::kWebPrintScalingOptionSourceSize
             : scaling_option;
     SetPrintPagesParams(print_settings);
@ -390,7 +390,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
     if (print_settings.params.dpi.IsEmpty() ||
         !print_settings.params.document_cookie) {
       DidFinishPrinting(OK);  // Release resources and fail silently on failure.
-@@ -1854,10 +1870,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
+@@ -1853,10 +1869,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
   return printed_pages;
 }
 
@ -418,7 +418,7 @@ index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf
   // Check if the printer returned any settings, if the settings is empty, we
   // can safely assume there are no printer drivers configured. So we safely
   // terminate.
-@@ -1877,12 +1907,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
+@@ -1876,12 +1906,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
   return result;
 }
 
--- a/patches/common/chromium/render_widget_host_view_base.patch
+++ b/patches/common/chromium/render_widget_host_view_base.patch
@ -5,7 +5,7 @@ Subject: render_widget_host_view_base.patch


 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 68d55c2f9e2da0a987cd0629762bf2dfa32b83f5..0ce79827459e67c65da2bac738663610d278b56a 100644
+index 2672a26d934d082d4c12c4c40db191963d5b789a..b25dada44e04f0299e11919e02c84d5c3a596668 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -652,6 +652,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(
@ -25,7 +25,7 @@ index 68d55c2f9e2da0a987cd0629762bf2dfa32b83f5..0ce79827459e67c65da2bac738663610
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 148c980a6f6062f2191658055a8294d3b93eb517..bb58cfc26558e39fe771a6d0c30c88bdbd36da49 100644
+index 8cdb72afa1bce774414fc494c1403630961611f2..1887ec9995909f9883fe06af4a9bbe65aca80958 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -23,8 +23,10 @@
--- a/patches/common/chromium/render_widget_host_view_mac.patch
+++ b/patches/common/chromium/render_widget_host_view_mac.patch
@ -66,7 +66,7 @@ index ed18a0a46c22620850d4384e6bb82dba80a3b6d8..c940999eeec8fcf2a2a4514d0edd67f8
   return validAttributesForMarkedText_.get();
 }
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 7bdf6790c3b2275979cfcbe8c100c05e0f668ee7..82e72fd8bd923cb013dc655c83ccf4b5838d569f 100644
+index f6937e35b3e4421a5584d6046ba824ac7e0d0847..b150724b7bee7ffe171a3095519ecd2ca9a38826 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -61,6 +61,7 @@
--- a/patches/common/chromium/resource_file_conflict.patch
+++ b/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 ececd22ccf241a21666b1964c4bce053e1ab504a..2b1b875437102c9fd2573df3ad0688a40a69d499 100644
+index 3bd3fb2b18fb6309b22d2ffff5b3372afd6e486d..523faaa6df78cac1b758f49f8180583c7682c85a 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1647,7 +1647,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1650,7 +1650,7 @@ if (is_chrome_branded && !is_android) {
   }
 }
 
@ -64,7 +64,7 @@ index ececd22ccf241a21666b1964c4bce053e1ab504a..2b1b875437102c9fd2573df3ad0688a4
   chrome_paks("packed_resources") {
     if (is_mac) {
       output_dir = "$root_gen_dir/repack"
-@@ -1671,6 +1671,12 @@ if (!is_android) {
+@@ -1674,6 +1674,12 @@ if (!is_android) {
   }
 }
 
--- a/patches/common/chromium/scroll_bounce_flag.patch
+++ b/patches/common/chromium/scroll_bounce_flag.patch
@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.

 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 44d963793f143530704a0a06273e51d7c68766cc..5cea319fea51e27f6bd5be7221bafb186b2a3973 100644
+index 9d029d4ee65b3246b3cca4c338e53c43731a6e5d..b4ad334e00bcbaa5ad4d96a3f34b2372027a35f0 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
@@ -1535,7 +1535,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
--- a/patches/common/chromium/ssl_security_state_tab_helper.patch
+++ b/patches/common/chromium/ssl_security_state_tab_helper.patch
@ -6,7 +6,7 @@ Subject: ssl_security_state_tab_helper.patch
 Allows populating security tab info for devtools in Electron.

 diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
-index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8db3d5937 100644
+index 4c1b8bda5a8dbd52d0047e8945490d25c21a3164..2fcc2f9a2b233223b99d67df0f2ecaf02b464ae7 100644
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -12,10 +12,12 @@
@ -22,7 +22,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/secure_origin_whitelist.h"
-@@ -41,7 +43,7 @@
+@@ -42,7 +44,7 @@
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif  // defined(OS_CHROMEOS)
 
@ -31,7 +31,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
 #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
 #endif
 
-@@ -77,7 +79,9 @@ bool IsOriginSecureWithWhitelist(
+@@ -78,7 +80,9 @@ bool IsOriginSecureWithWhitelist(
 
 }  // namespace
 
@ -41,7 +41,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
 
 SecurityStateTabHelper::SecurityStateTabHelper(
     content::WebContents* web_contents)
-@@ -137,6 +141,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
+@@ -138,6 +142,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
     UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
   }
 
@ -49,7 +49,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
   // Security indicator UI study (https://crbug.com/803501): Show a message in
   // the console to reduce developer confusion about the experimental UI
   // treatments for HTTPS pages with EV certificates.
-@@ -164,6 +169,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
+@@ -165,6 +170,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
           "Validation is still valid.");
     }
   }
@ -57,7 +57,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
 }
 
 void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
-@@ -189,6 +195,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -190,6 +196,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
       web_contents()->GetController().GetVisibleEntry();
   if (!entry)
     return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -65,7 +65,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
   safe_browsing::SafeBrowsingService* sb_service =
       g_browser_process->safe_browsing_service();
   if (!sb_service)
-@@ -256,6 +263,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -257,6 +264,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
         break;
     }
   }
@ -73,7 +73,7 @@ index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8
   return security_state::MALICIOUS_CONTENT_STATUS_NONE;
 }
 
-@@ -274,15 +282,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
+@@ -275,15 +283,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
     const {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
--- a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch
@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.

 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index c6feebd62b98c18d260088b5a60fc59b2c2e0d1a..17edbd3a08010f257152e857a178af83c9aaf3d6 100644
+index 92a6bcde3867a8d0f7a36e5b892de67b9d777f60..2588bbfa0f90f7e2204e9d544c8cc562396ae9ad 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -423,6 +423,10 @@ class RendererSandboxedProcessLauncherDelegate
@ -58,7 +58,7 @@ index c6feebd62b98c18d260088b5a60fc59b2c2e0d1a..17edbd3a08010f257152e857a178af83
 };
 
 const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1748,11 +1760,18 @@ bool RenderProcessHostImpl::Init() {
+@@ -1741,11 +1753,18 @@ bool RenderProcessHostImpl::Init() {
       cmd_line->PrependWrapper(renderer_prefix);
     AppendRendererCommandLine(cmd_line.get());
 
--- a/patches/common/chromium/web_contents.patch
+++ b/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 09c35a2bfe0c9d347e3b06d32d839aef50ef3f41..eca683e0529784699425a6432b96dff76fc20f1d 100644
+index 9ad76884fa8cff7e9940a478a50df0260dda366a..d6590498e9f188a829440e61a169fb57221a3b5f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2047,6 +2047,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2068,6 +2068,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 09c35a2bfe0c9d347e3b06d32d839aef50ef3f41..eca683e0529784699425a6432b96dff7
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -2062,6 +2068,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2083,6 +2089,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
           &render_view_host_delegate_view_);
     }
   }
--- a/patches/common/chromium/webgl_context_attributes.patch
+++ b/patches/common/chromium/webgl_context_attributes.patch
@ -5,7 +5,7 @@ Subject: webgl_context_attributes.patch


 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index a1538e5ca041ed42e3c77512434fcc2a2ed77533..de849f696e15004cda5648f565972f4529503d50 100644
+index 1277a3b2c1e4d9ff61d7e4968831e03e57395c51..b9f3d081a6ff0309aa4f2133e42bc097addaaf4e 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -916,8 +916,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
--- a/patches/common/chromium/worker_context_will_destroy.patch
+++ b/patches/common/chromium/worker_context_will_destroy.patch
@ -21,7 +21,7 @@ index 3b5c53a10c8d6aa2e173a7e7788e8955c7299d4f..614f5f8296c13f127cb081d1b05c908a
   // An empty URL is returned if the URL is not overriden.
   virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index de849f696e15004cda5648f565972f4529503d50..2c007dbd46f39a85406e2ffe23cd44d4f7d02574 100644
+index b9f3d081a6ff0309aa4f2133e42bc097addaaf4e..276a52e903658748d373e61be9b084a1f44519d1 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1064,6 +1064,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
--- a/patches/common/v8/add_realloc.patch
+++ b/patches/common/v8/add_realloc.patch
@ -12,7 +12,7 @@ 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 4e9af49e6b2e00111b44b03ce2a9a66c2d7d5563..e19bdc0ca5a247d82370d7081491bfc3870ca81e 100644
+index 6ecc48af33288c1d5b8a8d847581c1edd8c173f9..ea203a23a945a03e4494a1b3d615381dd5699e2c 100644
 --- a/include/v8.h
 +++ b/include/v8.h
@@ -4695,6 +4695,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@ -30,7 +30,7 @@ index 4e9af49e6b2e00111b44b03ce2a9a66c2d7d5563..e19bdc0ca5a247d82370d7081491bfc3
      * 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 5a06fd039026bb6de9d0076ca6eab5d823229095..39bea066c11597649a06a14b8575de83e18f65fa 100644
+index 168522f8c36b4385479ebba7f06f8a5261ab7a85..b87dfac21d26177128f7c434bc2577e18ab905c6 100644
 --- a/src/api.cc
 +++ b/src/api.cc
@@ -516,6 +516,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
--- a/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch
+++ b/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 5b3e0831c2657f4fa07adaa1de5fda6d2360c2ec..344a7fb5c5e54295fc7fd4f61780bdcf40bd6bd4 100644
+index d3dbe37d0a145921dddaea72e394c87826d6d5fe..61f952f1a577b17c6063996fd1e17a195714bf5a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -178,7 +178,9 @@ declare_args() {
@ -20,7 +20,7 @@ index 5b3e0831c2657f4fa07adaa1de5fda6d2360c2ec..344a7fb5c5e54295fc7fd4f61780bdcf
   v8_generator_toolchain = "//build/toolchain/linux:clang_x64"
 }
 
-@@ -3539,7 +3541,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
+@@ -3545,7 +3547,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
   }
 }
 
--- a/patches/common/v8/build_gn.patch
+++ b/patches/common/v8/build_gn.patch
@ -5,7 +5,7 @@ Subject: build_gn.patch


 diff --git a/BUILD.gn b/BUILD.gn
-index af4cf7667e274462878580ddba56f4168d89f237..65a82149f400d65ffd5c3be68bc4306e80b3cff7 100644
+index fddd525297773e843cbd7a8b11a72c3e094b06d8..d8a2b8e11a3e0e9820dca061a00dbf1a6859bcf4 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -240,7 +240,7 @@ config("internal_config") {
@ -17,7 +17,7 @@ index af4cf7667e274462878580ddba56f4168d89f237..65a82149f400d65ffd5c3be68bc4306e
     defines += [ "BUILDING_V8_SHARED" ]
   }
 }
-@@ -3524,6 +3524,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
+@@ -3530,6 +3530,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
 
     configs = [ ":internal_config" ]
 
--- a/patches/common/v8/dcheck.patch
+++ b/patches/common/v8/dcheck.patch
@ -5,10 +5,10 @@ Subject: dcheck.patch


 diff --git a/src/api.cc b/src/api.cc
-index b14e53bc93102157841316d1fdbdb524a1a89c73..63a0ed79fb8dbc78db0ff9578ef1bb5cfc1663f5 100644
+index 16b3d6d6d29ff6c79245e8f69132d7367708024e..3b5c0a8efa502cf0caf1dae9b426bab1c86d16b6 100644
 --- a/src/api.cc
 +++ b/src/api.cc
-@@ -8628,7 +8628,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -8620,7 +8620,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
 
 
 void Isolate::RunMicrotasks() {
@ -18,10 +18,10 @@ index b14e53bc93102157841316d1fdbdb524a1a89c73..63a0ed79fb8dbc78db0ff9578ef1bb5c
   isolate->default_microtask_queue()->RunMicrotasks(isolate);
 }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 0462e9ee245cbfec985ae1a2ffe4f6699531e3aa..3c312c97f152846980073ab4187ac47fa388b46f 100644
+index e72269d40a369f2e9ae9f12b54fe8f828e252a9a..1192c1ee6cc19eac3dff7ce36e364aa1403eafbc 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -4848,9 +4848,9 @@ void Heap::TearDown() {
+@@ -4855,9 +4855,9 @@ void Heap::TearDown() {
 void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                  GCType gc_type, void* data) {
   DCHECK_NOT_NULL(callback);
--- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch
+++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch
@ -22,7 +22,7 @@ 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 e19bdc0ca5a247d82370d7081491bfc3870ca81e..2a67b22279edff6915a56d2e5e37f3415dde77e8 100644
+index ea203a23a945a03e4494a1b3d615381dd5699e2c..6145cbca82fa30d42ef9e5ecf2caf7a571594098 100644
 --- a/include/v8.h
 +++ b/include/v8.h
@@ -1144,6 +1144,10 @@ class V8_EXPORT PrimitiveArray {
@ -134,7 +134,7 @@ index e19bdc0ca5a247d82370d7081491bfc3870ca81e..2a67b22279edff6915a56d2e5e37f341
     Value(Isolate* isolate, Local<v8::Value> obj);
     ~Value();
     uint16_t* operator*() { return str_; }
-@@ -5384,6 +5423,8 @@ class V8_EXPORT BooleanObject : public Object {
+@@ -5386,6 +5425,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 e19bdc0ca5a247d82370d7081491bfc3870ca81e..2a67b22279edff6915a56d2e5e37f341
 
   Local<String> ValueOf() const;
 
-@@ -10454,6 +10495,30 @@ template <class T> Value* Value::Cast(T* value) {
+@@ -10493,6 +10534,30 @@ template <class T> Value* Value::Cast(T* value) {
 }
 
 
@ -175,7 +175,7 @@ index e19bdc0ca5a247d82370d7081491bfc3870ca81e..2a67b22279edff6915a56d2e5e37f341
 #ifdef V8_ENABLE_CHECKS
   CheckCast(value);
 diff --git a/src/api.cc b/src/api.cc
-index 39bea066c11597649a06a14b8575de83e18f65fa..b14e53bc93102157841316d1fdbdb524a1a89c73 100644
+index b87dfac21d26177128f7c434bc2577e18ab905c6..16b3d6d6d29ff6c79245e8f69132d7367708024e 100644
 --- a/src/api.cc
 +++ b/src/api.cc
@@ -2227,6 +2227,10 @@ int PrimitiveArray::Length() const {
@ -330,7 +330,7 @@ index 39bea066c11597649a06a14b8575de83e18f65fa..b14e53bc93102157841316d1fdbdb524
 Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate,
                                        Local<String> value) {
   i::Handle<i::String> string = Utils::OpenHandle(*value);
-@@ -8951,6 +9033,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
+@@ -8970,6 +9052,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
   return microtask_queue->IsRunningMicrotasks();
 }
 
@ -340,7 +340,7 @@ index 39bea066c11597649a06a14b8575de83e18f65fa..b14e53bc93102157841316d1fdbdb524
 String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
     : str_(nullptr), length_(0) {
   if (obj.IsEmpty()) return;
-@@ -8970,6 +9055,9 @@ String::Utf8Value::~Utf8Value() {
+@@ -8989,6 +9074,9 @@ String::Utf8Value::~Utf8Value() {
   i::DeleteArray(str_);
 }
 
--- a/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch
+++ b/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 344a7fb5c5e54295fc7fd4f61780bdcf40bd6bd4..bdb82a0d813cb5abd612dc937135478911da25f3 100644
+index 61f952f1a577b17c6063996fd1e17a195714bf5a..2a1c7d0348ace504c9b26850de7340d981cbb440 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -1316,9 +1316,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
+@@ -1322,9 +1322,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
     ]
     public_deps = [
       ":natives_blob",
--- a/patches/common/v8/expose_mksnapshot.patch
+++ b/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 65a82149f400d65ffd5c3be68bc4306e80b3cff7..5b3e0831c2657f4fa07adaa1de5fda6d2360c2ec 100644
+index d8a2b8e11a3e0e9820dca061a00dbf1a6859bcf4..d3dbe37d0a145921dddaea72e394c87826d6d5fe 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -3514,8 +3514,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3520,8 +3520,6 @@ if (current_toolchain == v8_generator_toolchain) {
 
 if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
   v8_executable("mksnapshot") {