chore: bump chromium to 964c4bca8de5c320534d95606c861 (master) (#18440)

* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1

* chore: update patches

* Revert "disable robotjs-based tests"

This reverts commit e56adafc1f.

* Revert "skip dbus tests (#18409)"

This reverts commit aea042cc83.

* Revert "skip more dbus tests"

This reverts commit 68dbef48da.

* chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605

* chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596

* chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774

* chore: update patches

* chore: update ssl_security_state_tab_helper.patch

* Remove content_packaged_services

https://chromium-review.googlesource.com/c/chromium/src/+/1604203

* chore: fix false positive lint error

* views: wireup widget name to crash data

https://chromium-review.googlesource.com/c/chromium/src/+/1626640

* chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861

* roll patches

DEPS

@@ -10,7 +10,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '6a008993a2e54af93edd956a53c786668bc0e253',
+    'ab588d36191964c4bca8de5c320534d95606c861',
   'node_version':
     'a86a4a160dc520c61a602c949a32a1bc4c0fc633',
 

atom/app/manifests.cc

@@ -18,6 +18,22 @@
 #include "chrome/services/printing/public/cpp/manifest.h"
 #endif
 
+namespace {
+
+// TODO(https://crbug.com/781334): Remove these helpers and just update the
+// manifest definitions to be marked out-of-process. This is here only to avoid
+// extra churn when transitioning away from content_packaged_services.
+service_manager::Manifest MakeOutOfProcess(
+    const service_manager::Manifest& manifest) {
+  // cpplint.py emits a false positive [build/include_what_you_use]
+  service_manager::Manifest copy(manifest);  // NOLINT
+  copy.options.execution_mode =
+      service_manager::Manifest::ExecutionMode::kOutOfProcessBuiltin;
+  return copy;
+}
+
+}  // namespace
+
 const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
   static base::NoDestructor<service_manager::Manifest> manifest{
       service_manager::ManifestBuilder()
@@ -35,14 +51,14 @@ const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
 }
 
 const std::vector<service_manager::Manifest>&
-GetElectronPackagedServicesOverlayManifest() {
+GetElectronBuiltinServiceManifests() {
   static base::NoDestructor<std::vector<service_manager::Manifest>> manifests{{
-      proxy_resolver::GetManifest(),
+      MakeOutOfProcess(proxy_resolver::GetManifest()),
 #if BUILDFLAG(ENABLE_PRINTING)
-      printing::GetPdfCompositorManifest(),
+      MakeOutOfProcess(printing::GetPdfCompositorManifest()),
 #endif
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-      GetChromePrintingManifest(),
+      MakeOutOfProcess(GetChromePrintingManifest()),
 #endif
   }};
   return *manifests;

atom/app/manifests.h

@@ -11,6 +11,6 @@
 
 const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
 const std::vector<service_manager::Manifest>&
-GetElectronPackagedServicesOverlayManifest();
+GetElectronBuiltinServiceManifests();
 
 #endif  // ATOM_APP_MANIFESTS_H_

atom/browser/atom_browser_client.cc

@@ -722,17 +722,16 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
 
 base::Optional<service_manager::Manifest>
 AtomBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
-  if (name == content::mojom::kBrowserServiceName) {
+  if (name == content::mojom::kBrowserServiceName)
     return GetElectronContentBrowserOverlayManifest();
-  } else if (name == content::mojom::kPackagedServicesServiceName) {
-    service_manager::Manifest overlay;
-    overlay.packaged_services = GetElectronPackagedServicesOverlayManifest();
-    return overlay;
-  }
-
   return base::nullopt;
 }
 
+std::vector<service_manager::Manifest>
+AtomBrowserClient::GetExtraServiceManifests() {
+  return GetElectronBuiltinServiceManifests();
+}
+
 net::NetLog* AtomBrowserClient::GetNetLog() {
   return g_browser_process->net_log();
 }

atom/browser/atom_browser_client.h

@@ -145,6 +145,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
   void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
   base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
       base::StringPiece name) override;
+  std::vector<service_manager::Manifest> GetExtraServiceManifests() override;
   net::NetLog* GetNetLog() override;
   content::MediaObserver* GetMediaObserver() override;
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;

atom/browser/native_window_views.cc

@@ -58,7 +58,6 @@
 #elif defined(OS_WIN)
 #include "atom/browser/ui/views/win_frame_view.h"
 #include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
-#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/display/screen.h"
@@ -186,11 +185,7 @@ NativeWindowViews::NativeWindowViews(const mate::Dictionary& options,
   if (parent)
     params.parent = parent->GetNativeWindow();
 
-  params.native_widget = new AtomDesktopNativeWidgetAura(widget());
+  params.native_widget = new AtomDesktopNativeWidgetAura(this);
-  atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin(
-      this, widget(),
-      static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
-  params.desktop_window_tree_host = atom_desktop_window_tree_host_win_;
 #elif defined(USE_X11)
   std::string name = Browser::Get()->GetName();
   // Set WM_WINDOW_ROLE.

atom/browser/native_window_views.h

@@ -15,7 +15,6 @@
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_WIN)
-#include "atom/browser/ui/win/message_handler_delegate.h"
 #include "atom/browser/ui/win/taskbar_host.h"
 #include "base/win/scoped_gdi_object.h"
 #endif
@@ -30,16 +29,11 @@ class GlobalMenuBarX11;
 class RootView;
 class WindowStateWatcher;
 
-#if defined(OS_WIN)
+#if defined(USE_X11)
-class AtomDesktopWindowTreeHostWin;
-#elif defined(USE_X11)
 class EventDisabler;
 #endif
 
 class NativeWindowViews : public NativeWindow,
-#if defined(OS_WIN)
-                          public MessageHandlerDelegate,
-#endif
                           public views::WidgetObserver,
                           public ui::EventHandler {
  public:
@@ -142,6 +136,16 @@ class NativeWindowViews : public NativeWindow,
   void DecrementChildModals();
 
 #if defined(OS_WIN)
+  // Catch-all message handling and filtering. Called before
+  // HWNDMessageHandler's built-in handling, which may pre-empt some
+  // expectations in Views/Aura if messages are consumed. Returns true if the
+  // message was consumed by the delegate and should not be processed further
+  // by the HWNDMessageHandler. In this case, |result| is returned. |result| is
+  // not modified otherwise.
+  bool PreHandleMSG(UINT message,
+                    WPARAM w_param,
+                    LPARAM l_param,
+                    LRESULT* result);
   void SetIcon(HICON small_icon, HICON app_icon);
 #elif defined(USE_X11)
   void SetIcon(const gfx::ImageSkia& icon);
@@ -180,11 +184,6 @@ class NativeWindowViews : public NativeWindow,
 #endif
 
 #if defined(OS_WIN)
-  // MessageHandlerDelegate:
-  bool PreHandleMSG(UINT message,
-                    WPARAM w_param,
-                    LPARAM l_param,
-                    LRESULT* result) override;
   void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
   void SetForwardMouseMessages(bool forward);
   static LRESULT CALLBACK SubclassProc(HWND hwnd,
@@ -237,8 +236,6 @@ class NativeWindowViews : public NativeWindow,
 #endif
 
 #if defined(OS_WIN)
-  // Weak ref.
-  AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;
 
   ui::WindowShowState last_window_state_;
 

atom/browser/ui/win/atom_desktop_native_widget_aura.cc

@@ -3,18 +3,32 @@
 // found in the LICENSE file.
 
 #include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
+
+#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/wm/public/tooltip_client.h"
 
 namespace atom {
 
 AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
-    views::internal::NativeWidgetDelegate* delegate)
+    NativeWindowViews* native_window_view)
-    : views::DesktopNativeWidgetAura(delegate) {
+    : views::DesktopNativeWidgetAura(native_window_view->widget()),
+      native_window_view_(native_window_view) {
+  GetNativeWindow()->SetName("AtomDesktopNativeWidgetAura");
   // This is to enable the override of OnWindowActivated
   wm::SetActivationChangeObserver(GetNativeWindow(), this);
 }
 
+void AtomDesktopNativeWidgetAura::InitNativeWidget(
+    const views::Widget::InitParams& params) {
+  views::Widget::InitParams modified_params = params;
+  desktop_window_tree_host_ = new AtomDesktopWindowTreeHostWin(
+      native_window_view_,
+      static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
+  modified_params.desktop_window_tree_host = desktop_window_tree_host_;
+  views::DesktopNativeWidgetAura::InitNativeWidget(modified_params);
+}
+
 void AtomDesktopNativeWidgetAura::Activate() {
   // Activate can cause the focused window to be blurred so only
   // call when the window being activated is visible. This prevents

atom/browser/ui/win/atom_desktop_native_widget_aura.h

@@ -8,12 +8,18 @@
 #include "atom/browser/native_window_views.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
+namespace views {
+class DesktopWindowTreeHost;
+}
+
 namespace atom {
 
 class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
  public:
-  explicit AtomDesktopNativeWidgetAura(
+  explicit AtomDesktopNativeWidgetAura(NativeWindowViews* native_window_view);
-      views::internal::NativeWidgetDelegate* delegate);
+
+  // views::DesktopNativeWidgetAura:
+  void InitNativeWidget(const views::Widget::InitParams& params) override;
 
   // internal::NativeWidgetPrivate:
   void Activate() override;
@@ -22,6 +28,12 @@ class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
   void OnWindowActivated(wm::ActivationChangeObserver::ActivationReason reason,
                          aura::Window* gained_active,
                          aura::Window* lost_active) override;
+
+  NativeWindowViews* native_window_view_;
+
+  // Owned by DesktopNativeWidgetAura.
+  views::DesktopWindowTreeHost* desktop_window_tree_host_;
+
   DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);
 };
 

atom/browser/ui/win/atom_desktop_window_tree_host_win.cc

@@ -4,17 +4,14 @@
 
 #include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
 
-#include "atom/browser/ui/win/message_handler_delegate.h"
-
 namespace atom {
 
 AtomDesktopWindowTreeHostWin::AtomDesktopWindowTreeHostWin(
-    MessageHandlerDelegate* delegate,
+    NativeWindowViews* native_window_view,
-    views::internal::NativeWidgetDelegate* native_widget_delegate,
     views::DesktopNativeWidgetAura* desktop_native_widget_aura)
-    : views::DesktopWindowTreeHostWin(native_widget_delegate,
+    : views::DesktopWindowTreeHostWin(native_window_view->widget(),
                                       desktop_native_widget_aura),
-      delegate_(delegate) {}
+      native_window_view_(native_window_view) {}
 
 AtomDesktopWindowTreeHostWin::~AtomDesktopWindowTreeHostWin() {}
 
@@ -22,7 +19,7 @@ bool AtomDesktopWindowTreeHostWin::PreHandleMSG(UINT message,
                                                 WPARAM w_param,
                                                 LPARAM l_param,
                                                 LRESULT* result) {
-  return delegate_->PreHandleMSG(message, w_param, l_param, result);
+  return native_window_view_->PreHandleMSG(message, w_param, l_param, result);
 }
 
 bool AtomDesktopWindowTreeHostWin::HasNativeFrame() const {

atom/browser/ui/win/atom_desktop_window_tree_host_win.h

@@ -7,20 +7,15 @@
 
 #include <windows.h>
 
-#include <vector>
+#include "atom/browser/native_window_views.h"
-
-#include "atom/browser/native_window.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 
 namespace atom {
 
-class MessageHandlerDelegate;
-
 class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
  public:
   AtomDesktopWindowTreeHostWin(
-      MessageHandlerDelegate* delegate,
+      NativeWindowViews* native_window_view,
-      views::internal::NativeWidgetDelegate* native_widget_delegate,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura);
   ~AtomDesktopWindowTreeHostWin() override;
 
@@ -32,7 +27,7 @@ class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
   bool HasNativeFrame() const override;
 
  private:
-  MessageHandlerDelegate* delegate_;  // weak ref
+  NativeWindowViews* native_window_view_;  // weak ref
 
   DISALLOW_COPY_AND_ASSIGN(AtomDesktopWindowTreeHostWin);
 };

atom/browser/ui/win/message_handler_delegate.cc

@@ -1,16 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/ui/win/message_handler_delegate.h"
-
-namespace atom {
-
-bool MessageHandlerDelegate::PreHandleMSG(UINT message,
-                                          WPARAM w_param,
-                                          LPARAM l_param,
-                                          LRESULT* result) {
-  return false;
-}
-
-}  // namespace atom

atom/browser/ui/win/message_handler_delegate.h

@@ -1,28 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-#define ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-
-#include <windows.h>
-
-namespace atom {
-
-class MessageHandlerDelegate {
- public:
-  // Catch-all message handling and filtering. Called before
-  // HWNDMessageHandler's built-in handling, which may pre-empt some
-  // expectations in Views/Aura if messages are consumed. Returns true if the
-  // message was consumed by the delegate and should not be processed further
-  // by the HWNDMessageHandler. In this case, |result| is returned. |result| is
-  // not modified otherwise.
-  virtual bool PreHandleMSG(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param,
-                            LRESULT* result);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_

filenames.gni

@@ -513,8 +513,6 @@ filenames = {
     "atom/browser/ui/win/atom_desktop_window_tree_host_win.h",
     "atom/browser/ui/win/jump_list.cc",
     "atom/browser/ui/win/jump_list.h",
-    "atom/browser/ui/win/message_handler_delegate.cc",
-    "atom/browser/ui/win/message_handler_delegate.h",
     "atom/browser/ui/win/notify_icon_host.cc",
     "atom/browser/ui/win/notify_icon_host.h",
     "atom/browser/ui/win/notify_icon.cc",

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 06cf42e8199de15e2c32a59443b1daa1255d8882..4d66c30c45d87e70bce65f384a2944cf2697b1ae 100644
+index 58df3d9d8ddc27ad0fe84781e8b9251c55757e0f..84f1dd7bd2a15467f253cc0b5ac612ec2609c2cc 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -392,10 +392,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {

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 b552de393894d9a9b26d92693f9bcd1fdfb86aba..187615224412a349c758489d9e5e080282860983 100644
+index 797264d0cb4236ffc91f366cf6be30643cb7bf2b..c0cd0b41088773eb6226f2074d62a798346d1f72 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -3710,6 +3710,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -3712,6 +3712,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 82882159b0bac6d47d678c485de0aacc7db06c2d..dd2299094b79d82da7ec1cd8f559050b
  
  // 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 da482a1a1638f27a413502d9be16a5fb12e9678c..de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f 100644
+index ce9d0ede84da62061278f7fb0c543fc2e8a0216e..3729dcc9ea3272c943754a92c6ed1d7a1fd8fcf3 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -518,6 +518,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -45,18 +45,18 @@ index da482a1a1638f27a413502d9be16a5fb12e9678c..de19cb3a5f3d6685d8dede7c3cdb5b47
      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 5e79a99f045272846f3840547345adffb991421b..2c722d14437cdad69544e0c67921dbaec15b97da 100644
+index 449941ddc4d43dc4cb164f6af9dcc69991dddc8b..4c84fb3648b3de36015b325246559f8aefe2ebd5 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -175,6 +175,7 @@ class RenderFrameHost;
+@@ -177,6 +177,7 @@ class RenderFrameHost;
  class RenderProcessHost;
  class RenderViewHost;
  class ResourceContext;
 +class ResourceRequestBody;
  class SerialDelegate;
- class ServiceManagerConnection;
  class SiteInstance;
-@@ -801,6 +802,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+ class SpeechRecognitionManagerDelegate;
+@@ -802,6 +803,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,

patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch

@@ -12,7 +12,7 @@ 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 dcf8654b210be64d55d98c784075e2453e6dad8f..cee4e47229b8d6bbb1e8b8e985eb3bb0b240f910 100644
+index 33cbfcc644ee57392aead3081916205bab6aac4b..97913271560fce70da40a4561ba75d289efc26b5 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -750,7 +750,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {

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 5f22028d622e43d2fc0efe68976ec21c4afa60f5..5c180d5367be3df04b51fe00aa3a02abc2fefb60 100644
+index 80a9629832145f498c8f475922f9cfe7d32faed7..4bc87713d33742207d37b74ffd93cc8c4b7c5916 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1525,7 +1525,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1529,7 +1529,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
    }
  
    base::RunLoop run_loop;

patches/common/chromium/cross_site_document_resource_handler.patch

@@ -22,7 +22,7 @@ index 2151c5b9698e9a2768875d04a2297956cc4c0d41..8a316a117ab367bcbac947894cbe1bc2
  }
  
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index acf458d5c088607d3ceb6d058f28f076bf4cf712..4bdfeefc531b378f33b143ea432aebd69906bf08 100644
+index 2317ddf6a3c533f701fe44bf1b8114eb042c2189..9a823a98175c33c84b8d44a95c9d7d44568807ca 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,10 +37,10 @@ index acf458d5c088607d3ceb6d058f28f076bf4cf712..4bdfeefc531b378f33b143ea432aebd6
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 9c7c77b44d279219411ce545c5448acecbd56d59..f99105176cc97e13b5d2b7c470b95e23b404de0a 100644
+index a81f40507b2233c3bde03b940cccd6be0aaa4926..1a208d24bae80277e4a60f4180bb7f95c38561ce 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 {
+@@ -242,6 +242,9 @@ class CONTENT_EXPORT ContentBrowserClient {
        content::RenderFrameHost* rfh,
        content::SiteInstance* pending_site_instance) {}
  

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 d47e3fba4fb3f9048598dd4d56f156ab740fb56c..45656de4dc59038458128882a80e2508c81acb8d 100644
+index 25f8796f96bf176ef4bd222eb2426226b3107c83..8e7765eed9b9f24ddc3cb92e97893ff70dbeb683 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
 @@ -1242,8 +1242,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(

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 64dbeec700f4848966cd25940ae1a360de09f1d1..0a92b5d3501682cdd5101e3fdd8dde96580efc92 100644
+index f67479a1f9230f6869c281c884251792bf957cf9..deebf94235041cd439e5b94c81a43aa89b158445 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -285,6 +285,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index 64dbeec700f4848966cd25940ae1a360de09f1d1..0a92b5d3501682cdd5101e3fdd8dde96
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -934,6 +939,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
+@@ -936,6 +941,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
        hwnd());
  }
  
@@ -49,10 +49,10 @@ index 64dbeec700f4848966cd25940ae1a360de09f1d1..0a92b5d3501682cdd5101e3fdd8dde96
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index e51d2f358319108e1f5dd70898070caf655265bf..5efcdf139ef331f09f427f75a9a75ed270bcd433 100644
+index 060aa2dc02a27d76005657d92a62b466c07f8fce..6f93c637489e64c2e76b48147fc28063aecbe1c6 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
-@@ -189,6 +189,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
+@@ -192,6 +192,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
    using TouchIDs = std::set<DWORD>;
    enum class DwmFrameState { OFF, ON };
  

patches/common/chromium/disable_color_correct_rendering.patch

@@ -215,10 +215,10 @@ index f19bbb46ea6f3962f83d10fb400ae55584a17a9e..c5dff79af54a03ef888e4474e5ea5368
      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 982b82ef2b517bd21f05f24efc8e0d78c111d495..4a32760fc4764341d0c3a4d74b8f9fd044c891e9 100644
+index f58456df8d856346a2350b87ecd84de5b75e0d13..e0b39de61eb43f2ac779e273d3df937e38c201c4 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -218,6 +218,7 @@
+@@ -217,6 +217,7 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/base/ui_base_switches_util.h"
  #include "ui/display/display_switches.h"
@@ -226,7 +226,7 @@ index 982b82ef2b517bd21f05f24efc8e0d78c111d495..4a32760fc4764341d0c3a4d74b8f9fd0
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
-@@ -2925,6 +2926,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -2912,6 +2913,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[] = {
@@ -235,10 +235,10 @@ index 982b82ef2b517bd21f05f24efc8e0d78c111d495..4a32760fc4764341d0c3a4d74b8f9fd0
      network::switches::kExplicitlyAllowedPorts,
      service_manager::switches::kDisableInProcessStackTraces,
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
-index 3efeb92f38e2ec5bb7303fa1c66cbab7dc78671c..b67999f475460bd5bf3caa449d27a508c62e5b20 100644
+index 33817ba20ae6cbfec8a28313092df9c10b1bf966..ea1a574c1f6d2a0f880391b21397c2cb342cbc77 100644
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
-@@ -2799,6 +2799,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
+@@ -2810,6 +2810,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  

patches/common/chromium/disable_detach_webview_frame.patch

@@ -12,7 +12,7 @@ this patch was introduced in Chrome 66.
 Update(zcbenz): The bug is still in Chrome 72.
 
 diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
-index 7f0d8867dcf5eeaad3a1294014a141ff52e0643d..fc8b96dfd1c3a6d87ebc2cce1f736735e69743e6 100644
+index 40b42d5c85d693d15aedb6265628fe8da15dae76..1fdf88d06a869da2edad9383456cc89129f7d7cc 100644
 --- a/content/browser/frame_host/render_frame_proxy_host.cc
 +++ b/content/browser/frame_host/render_frame_proxy_host.cc
 @@ -261,6 +261,12 @@ void RenderFrameProxyHost::BubbleLogicalScroll(

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 41f62a2100fdd0a82cebdb52561fef32bae769e2..2179904cd2b27c47c036b2ee10a36592ceac6580 100644
+index bb3aff0859f1a6998889aa4b3fb2ca1143c0ed24..eb950ec3352634980447b91e46a652a877eb8782 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -3651,7 +3651,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
+@@ -3649,7 +3649,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/feat_offscreen_rendering_with_viz_compositor.patch

@@ -512,13 +512,13 @@ index 360cab3eee4c5189a55269d76daa1d78a98ed3d3..6834242f23d27fd6d428c2cd6040206a
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index ce87db97e02af3c4ec358ae688e0f2a96492d952..cacda701a6da00a22a2eaaaaf4d3fad543ce1a04 100644
+index 494241c374b7ffac0fa89549dc1b8a30359eb17f..5ac7c707374ebcb5510c76017edfcceee97b599e 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
+ #include "cc/trees/layer_tree_host_single_thread_client.h"
  #include "components/viz/common/frame_sinks/begin_frame_args.h"
  #include "components/viz/common/surfaces/frame_sink_id.h"
- #include "components/viz/common/surfaces/local_surface_id_allocation.h"
 +#include "components/viz/host/host_display_client.h"
  #include "components/viz/host/host_frame_sink_client.h"
  #include "services/viz/privileged/interfaces/compositing/vsync_parameter_observer.mojom-forward.h"
@@ -549,7 +549,7 @@ index ce87db97e02af3c4ec358ae688e0f2a96492d952..cacda701a6da00a22a2eaaaaf4d3fad5
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -467,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
+@@ -454,6 +467,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
    ui::ContextFactory* context_factory_;
    ui::ContextFactoryPrivate* context_factory_private_;
  

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 ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2db2aad086 100644
+index b5301d164138f21ca8ae01abfb153efde51ec324..91efc5f94f61f7bccc2ff802851097df8eb52818 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
-@@ -2141,6 +2141,16 @@ bool RenderFrameHostManager::InitRenderView(
+@@ -2127,6 +2127,16 @@ bool RenderFrameHostManager::InitRenderView(
  scoped_refptr<SiteInstance>
  RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      const NavigationRequest& request) {
@@ -27,7 +27,7 @@ index ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2d
    // 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();
-@@ -2173,6 +2183,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2159,6 +2169,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
                                                request.common_params().url);
      no_renderer_swap_allowed |=
          request.from_begin_navigation() && !can_renderer_initiate_transfer;
@@ -79,7 +79,7 @@ index ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2d
    } else {
      // Subframe navigations will use the current renderer, unless specifically
      // allowed to swap processes.
-@@ -2184,23 +2239,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2170,23 +2225,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 ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2d
  }
  
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f..acf458d5c088607d3ceb6d058f28f076bf4cf712 100644
+index 3729dcc9ea3272c943754a92c6ed1d7a1fd8fcf3..2317ddf6a3c533f701fe44bf1b8114eb042c2189 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,10 +129,10 @@ index de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f..acf458d5c088607d3ceb6d058f28f076
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 2c722d14437cdad69544e0c67921dbaec15b97da..9c7c77b44d279219411ce545c5448acecbd56d59 100644
+index 4c84fb3648b3de36015b325246559f8aefe2ebd5..a81f40507b2233c3bde03b940cccd6be0aaa4926 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(
+@@ -211,8 +211,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(
  // the observer interfaces.)
  class CONTENT_EXPORT ContentBrowserClient {
   public:

patches/common/chromium/mas_no_private_api.patch

@@ -181,10 +181,10 @@ index 237b07caa5ed7626c3b5b538cbb77f582f884203..cc4cb1ce9308ba8aecd6cc138954a1b5
    return nil;
  }
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index 8ccb8d266ef921b60c9db562f54431bb2bd8d327..1dbcdd5f7e742d993478190846b0052c0da252b5 100644
+index e02f5f922ea0eeca39fdf0acc265e1ef9dc254a6..764cac3182c3611e2c1fc4a0aa73b13ac81a9a72 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-@@ -489,6 +489,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -491,6 +491,7 @@ void PostAnnouncementNotification(NSString* announcement) {
        [user_info setObject:native_focus_object
                      forKey:NSAccessibilityTextChangeElement];
  
@@ -192,7 +192,7 @@ index 8ccb8d266ef921b60c9db562f54431bb2bd8d327..1dbcdd5f7e742d993478190846b0052c
        id selected_text = [native_focus_object selectedTextMarkerRange];
        if (selected_text) {
          NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-@@ -496,6 +497,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -498,6 +499,7 @@ void PostAnnouncementNotification(NSString* announcement) {
          [user_info setObject:selected_text
                        forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
        }

patches/common/chromium/printing.patch

@@ -283,7 +283,7 @@ 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 eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c1fe7aa0f 100644
+index 74f26daa76a22c749007f06a7f4eeeafb8bb297b..5c54aad4e874d723dd4b9e5733449d2af6d9e047 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -1115,7 +1115,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -337,7 +337,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
    print_preview_context_.OnPrintPreview();
  
    UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
-@@ -1622,7 +1630,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1621,7 +1629,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 eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -1633,7 +1644,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1632,7 +1643,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -361,7 +361,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1641,7 +1655,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1640,7 +1654,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    int expected_page_count = 0;
@@ -370,7 +370,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1661,8 +1675,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1660,8 +1674,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
  
      PrintMsg_PrintPages_Params print_settings;
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -382,7 +382,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -1672,6 +1687,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1671,6 +1686,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
              ? blink::kWebPrintScalingOptionSourceSize
              : scaling_option;
      SetPrintPagesParams(print_settings);
@@ -390,7 +390,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
      if (print_settings.params.dpi.IsEmpty() ||
          !print_settings.params.document_cookie) {
        DidFinishPrinting(OK);  // Release resources and fail silently on failure.
-@@ -1860,10 +1876,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
+@@ -1859,10 +1875,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
    return printed_pages;
  }
  
@@ -418,7 +418,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
    // 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.
-@@ -1883,12 +1913,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
+@@ -1882,12 +1912,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
    return result;
  }
  
@@ -438,7 +438,7 @@ index eb717d8d4be31b181d4646dafbfba87ed7fcfd91..ebcc563f040949e346a3daa85c766a9c
      Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id()));
      return false;
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index c4effb05d16cd67acf3d8140d25eb33fb4814dc3..0660062708438a2de7132b1a39dcbac85f8b8cbf 100644
+index 1e2777561ba600f8c11a59c79e3e1f6a4e4e696e..b4df0b89bce2ea7bf3a6ad2f02fb3821417cbb87 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -193,7 +193,9 @@ class PrintRenderFrameHelper
@@ -452,7 +452,7 @@ index c4effb05d16cd67acf3d8140d25eb33fb4814dc3..0660062708438a2de7132b1a39dcbac8
    void OnPrintForSystemDialog();
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void OnInitiatePrintPreview(bool has_selection);
-@@ -244,7 +246,10 @@ class PrintRenderFrameHelper
+@@ -243,7 +245,10 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -464,7 +464,7 @@ index c4effb05d16cd67acf3d8140d25eb33fb4814dc3..0660062708438a2de7132b1a39dcbac8
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -253,12 +258,14 @@ class PrintRenderFrameHelper
+@@ -252,12 +257,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.

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 3291e61a244ccf5e88fb8cafe10d01ce9b79b92c..9b5bb201f1725ca433d33a023bc887f6e85f648c 100644
+index a2902adc59b6b4083334130f3a8e29fca0c440d2..34673d9ab62311c458a581f98865014f01c4bcc0 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
 @@ -660,6 +660,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(

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 a1be2930c8dd785b1805260a82b37f8acfa80a5d..b7532fd8e220ecf1039bfa00412f9e930f7d1b02 100644
+index 2503eb797188cbb22be0ad703a35d30c16dfad9f..f0c614e9e174a2fa362242559026c8c30dee56bf 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1789,7 +1789,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1685,7 +1685,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index a1be2930c8dd785b1805260a82b37f8acfa80a5d..b7532fd8e220ecf1039bfa00412f9e93
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1813,6 +1813,12 @@ if (!is_android) {
+@@ -1709,6 +1709,12 @@ if (!is_android) {
    }
  }
  

patches/common/chromium/scroll_bounce_flag.patch

@@ -6,10 +6,10 @@ 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 ee84cf4e2791ccbe76f3527158c633e2b56e71c7..72033c83d8bb39dfbb748f22796f9ff69ef1e329 100644
+index 036f9c735e5409fe69c992a97eb57d7d224e6e81..97a9928d0c9ecd8c18f925e5d660e3de39745386 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1513,7 +1513,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
+@@ -1520,7 +1520,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {

patches/common/chromium/ssl_security_state_tab_helper.patch

@@ -6,10 +6,10 @@ 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 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f500c44c96b 100644
+index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a199f0ee15427b4ea45018702048800a21d96fd5 100644
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -13,10 +13,12 @@
+@@ -13,13 +13,17 @@
  #include "base/strings/pattern.h"
  #include "base/strings/string_util.h"
  #include "build/build_config.h"
@@ -20,9 +20,14 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
  #include "chrome/browser/safe_browsing/ui_manager.h"
 +#endif
  #include "chrome/common/secure_origin_whitelist.h"
++#if 0
  #include "components/omnibox/browser/omnibox_field_trial.h"
  #include "components/omnibox/common/omnibox_features.h"
-@@ -42,8 +44,10 @@
++#endif
+ #include "components/security_state/content/content_utils.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/navigation_entry.h"
+@@ -42,8 +46,10 @@
  #endif  // defined(OS_CHROMEOS)
  
  #if defined(FULL_SAFE_BROWSING)
@@ -33,7 +38,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
  
  namespace {
  
-@@ -63,7 +67,9 @@ void RecordSecurityLevel(
+@@ -63,7 +69,9 @@ void RecordSecurityLevel(
  
  }  // namespace
  
@@ -43,7 +48,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
  
  SecurityStateTabHelper::SecurityStateTabHelper(
      content::WebContents* web_contents)
-@@ -129,6 +135,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
+@@ -129,6 +137,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
      UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
    }
  
@@ -51,7 +56,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
    // 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.
-@@ -156,6 +163,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
+@@ -156,6 +165,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
            "Validation is still valid.");
      }
    }
@@ -59,7 +64,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
  }
  
  void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
-@@ -179,6 +187,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -179,6 +189,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
        web_contents()->GetController().GetVisibleEntry();
    if (!entry)
      return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@@ -67,7 +72,7 @@ index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f50
    safe_browsing::SafeBrowsingService* sb_service =
        g_browser_process->safe_browsing_service();
    if (!sb_service)
-@@ -246,6 +255,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -246,6 +257,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
          break;
      }
    }

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 763bec5cedfc44e59ccd40dcbcf7b3f9544cd56e..982b82ef2b517bd21f05f24efc8e0d78c111d495 100644
+index a1ed7949ba0623af8989b7286c11bca797278227..f58456df8d856346a2350b87ecd84de5b75e0d13 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -418,6 +418,10 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -417,6 +417,10 @@ class RendererSandboxedProcessLauncherDelegate
      : public SandboxedProcessLauncherDelegate {
   public:
    RendererSandboxedProcessLauncherDelegate() {}
@@ -36,7 +36,7 @@ index 763bec5cedfc44e59ccd40dcbcf7b3f9544cd56e..982b82ef2b517bd21f05f24efc8e0d78
  
    ~RendererSandboxedProcessLauncherDelegate() override {}
  
-@@ -437,6 +441,9 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -436,6 +440,9 @@ class RendererSandboxedProcessLauncherDelegate
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
    service_manager::ZygoteHandle GetZygote() override {
@@ -46,7 +46,7 @@ index 763bec5cedfc44e59ccd40dcbcf7b3f9544cd56e..982b82ef2b517bd21f05f24efc8e0d78
      const base::CommandLine& browser_command_line =
          *base::CommandLine::ForCurrentProcess();
      base::CommandLine::StringType renderer_prefix =
-@@ -450,6 +457,11 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -449,6 +456,11 @@ class RendererSandboxedProcessLauncherDelegate
    service_manager::SandboxType GetSandboxType() override {
      return service_manager::SANDBOX_TYPE_RENDERER;
    }
@@ -58,7 +58,7 @@ index 763bec5cedfc44e59ccd40dcbcf7b3f9544cd56e..982b82ef2b517bd21f05f24efc8e0d78
  };
  
  const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1730,11 +1742,18 @@ bool RenderProcessHostImpl::Init() {
+@@ -1729,11 +1741,18 @@ bool RenderProcessHostImpl::Init() {
        cmd_line->PrependWrapper(renderer_prefix);
      AppendRendererCommandLine(cmd_line.get());
  

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 5ddd9e7545d2139545fcf3e308d64a5a68a99735..27f69b81ba9ba2b96c7832ca7933ee496ec1b7e4 100644
+index 05f63c0802d4af296064e258e827098fbe97e972..0b3cee64c9a13ed6cc0f187571eb90db12fcb66a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2067,6 +2067,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 5ddd9e7545d2139545fcf3e308d64a5a68a99735..27f69b81ba9ba2b96c7832ca7933ee49
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2082,6 +2088,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2083,6 +2089,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
            &render_view_host_delegate_view_);
      }
    }

patches/common/chromium/worker_context_will_destroy.patch

@@ -5,7 +5,7 @@ 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 5bcf6f95f630ae6232ec9be7d8de7360a1592566..3142a8286e6aaf508a06cee0e32c73903682261f 100644
+index fa2e153443329bcb5a48fe5c577db74a1aec26ca..6bad6c2e34e73d990d49fca4ad953cfbf8deba83 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
 @@ -384,6 +384,11 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -21,10 +21,10 @@ index 5bcf6f95f630ae6232ec9be7d8de7360a1592566..3142a8286e6aaf508a06cee0e32c7390
    // 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 2c8ade035da690db45fc629ef2aeebf701b20c59..3a23749a6b4a938320edcdc01857c5c741c66b6a 100644
+index 67f40c54f2e9cfec538576dc9e9da6f495ba62aa..61bbe9cb061d83cbcc01999877d6082020ad76ba 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -1051,6 +1051,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -1044,6 +1044,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -38,10 +38,10 @@ index 2c8ade035da690db45fc629ef2aeebf701b20c59..3a23749a6b4a938320edcdc01857c5c7
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 39d9cf7590c11a178acbf8f9c6dbc3d20088860c..bef9d6351c2a9456ffc5279343515c017a390d97 100644
+index 7b550279f319d673ce8e4b6f4ad6e9451685bd5b..81e20536edee59ca31f2f674592e31dafb21d22c 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -200,6 +200,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -199,6 +199,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -50,10 +50,10 @@ index 39d9cf7590c11a178acbf8f9c6dbc3d20088860c..bef9d6351c2a9456ffc5279343515c01
    void RecordMetricsForBackgroundedRendererPurge() override;
  
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index f2a375b8fc9fd8ef808898ace40139f533c5dae4..083e94481c4c9f8a485984c849e5d2960a4cf6b5 100644
+index 23173b3891d046f96e97f786898c33e67a067c67..ea040ee90e7d544fcca371945e08267d61c7ebe9 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -656,6 +656,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -655,6 +655,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

patches/common/v8/.patches

@@ -5,4 +5,3 @@ deps_provide_more_v8_backwards_compatibility.patch
 dcheck.patch
 export_symbols_needed_for_windows_build.patch
 workaround_an_undefined_symbol_error.patch
-revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch

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 29c32d5ab77db52e4e02f140ac38ef46ff7bfc41..0b517b7a469451952723e10ad834d94c2f17e3e3 100644
+index c54b088404229dccf015e20b6a5bab19d3d94e69..cc603dc4aae69de4b09f06ed0bca48cdae8eebd3 100644
 --- a/include/v8.h
 +++ b/include/v8.h
 @@ -4624,6 +4624,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@@ -30,7 +30,7 @@ index 29c32d5ab77db52e4e02f140ac38ef46ff7bfc41..0b517b7a469451952723e10ad834d94c
       * 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/api.cc b/src/api/api.cc
-index 3eb1db63bec192fd2f397f3c4951eaca896ea81c..dcd2a79adf1f1b685f7384208786a18d9f593384 100644
+index 74fc41ae4935044bc23c11a511abd5342d8f8e5d..a4e275c19097a9083606707d969791194e9b23d0 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
 @@ -515,6 +515,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

patches/common/v8/build_gn.patch

@@ -5,10 +5,10 @@ Subject: build_gn.patch
 
 
 diff --git a/BUILD.gn b/BUILD.gn
-index aafcdf3d178284c247f0f502f02b8dd8c1aafafd..62fb301fd3e708d093e052916da98af99ed76597 100644
+index bb9372d63ba90a1f78db0310bde991d5ff789285..01ef8b8420cb951db372753a4d8b9e987cfb237c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -273,7 +273,7 @@ config("internal_config") {
+@@ -269,7 +269,7 @@ config("internal_config") {
      ":v8_header_features",
    ]
  
@@ -17,7 +17,7 @@ index aafcdf3d178284c247f0f502f02b8dd8c1aafafd..62fb301fd3e708d093e052916da98af9
      defines += [ "BUILDING_V8_SHARED" ]
    }
  }
-@@ -3776,7 +3776,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3784,7 +3784,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -26,7 +26,7 @@ index aafcdf3d178284c247f0f502f02b8dd8c1aafafd..62fb301fd3e708d093e052916da98af9
  
      deps = [
        ":v8_libbase",
-@@ -3801,6 +3801,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
+@@ -3815,6 +3815,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/api.cc b/src/api/api.cc
-index 56ef6b87cb7982deed05251d57b1008c54725f91..d0cc0b40be5f6219b6c6ccb8e3d9708734e7b14b 100644
+index a0e2766c60eee5e2bd1d7b651b1e16f656f79cdd..53f4449081e5ba082af72d7ab2db37e3eebdba46 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -8246,7 +8246,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -8236,7 +8236,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::RunMicrotasks() {
@@ -18,10 +18,10 @@ index 56ef6b87cb7982deed05251d57b1008c54725f91..d0cc0b40be5f6219b6c6ccb8e3d97087
    isolate->default_microtask_queue()->RunMicrotasks(isolate);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 6ff808c76bc0905e5b42f3e9949631ff6a7fd300..07f7b61c78748614f5f8a6a3f72d7b5d20fae415 100644
+index 52387b5bc16e47c7453c13213549d3721e59e46d..8cdb21d3f1463fdbc4fc641c7bc8d30f3f07fe59 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -5074,9 +5074,9 @@ void Heap::TearDown() {
+@@ -5080,9 +5080,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);

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 0b517b7a469451952723e10ad834d94c2f17e3e3..4d2dcde69f3e11a19df85eed015278db2f46dc95 100644
+index cc603dc4aae69de4b09f06ed0bca48cdae8eebd3..c59b0fa69880c237e3b60f190160d8b94862bf36 100644
 --- a/include/v8.h
 +++ b/include/v8.h
 @@ -1108,6 +1108,10 @@ class V8_EXPORT PrimitiveArray {
@@ -143,7 +143,7 @@ index 0b517b7a469451952723e10ad834d94c2f17e3e3..4d2dcde69f3e11a19df85eed015278db
  
    Local<String> ValueOf() const;
  
-@@ -10399,6 +10440,29 @@ template <class T> Value* Value::Cast(T* value) {
+@@ -10384,6 +10425,29 @@ template <class T> Value* Value::Cast(T* value) {
  }
  
  
@@ -174,10 +174,10 @@ index 0b517b7a469451952723e10ad834d94c2f17e3e3..4d2dcde69f3e11a19df85eed015278db
  #ifdef V8_ENABLE_CHECKS
    CheckCast(value);
 diff --git a/src/api/api.cc b/src/api/api.cc
-index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c54725f91 100644
+index a4e275c19097a9083606707d969791194e9b23d0..a0e2766c60eee5e2bd1d7b651b1e16f656f79cdd 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -2179,6 +2179,10 @@ int PrimitiveArray::Length() const {
+@@ -2171,6 +2171,10 @@ int PrimitiveArray::Length() const {
    return array->length();
  }
  
@@ -188,7 +188,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  void PrimitiveArray::Set(Isolate* v8_isolate, int index,
                           Local<Primitive> item) {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -2192,6 +2196,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index,
+@@ -2184,6 +2188,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index,
    array->set(index, *i_item);
  }
  
@@ -199,7 +199,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  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);
-@@ -2875,6 +2883,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) {
+@@ -2867,6 +2875,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) {
  
  // --- S t a c k T r a c e ---
  
@@ -210,7 +210,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  Local<StackFrame> StackTrace::GetFrame(Isolate* v8_isolate,
                                         uint32_t index) const {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -3461,6 +3473,34 @@ MaybeLocal<BigInt> Value::ToBigInt(Local<Context> context) const {
+@@ -3453,6 +3465,34 @@ MaybeLocal<BigInt> Value::ToBigInt(Local<Context> context) const {
    RETURN_ESCAPED(result);
  }
  
@@ -245,7 +245,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  bool Value::BooleanValue(Isolate* v8_isolate) const {
    return Utils::OpenHandle(this)->BooleanValue(
        reinterpret_cast<i::Isolate*>(v8_isolate));
-@@ -3809,6 +3849,11 @@ MaybeLocal<Uint32> Value::ToArrayIndex(Local<Context> context) const {
+@@ -3801,6 +3841,11 @@ MaybeLocal<Uint32> Value::ToArrayIndex(Local<Context> context) const {
    return Local<Uint32>();
  }
  
@@ -257,7 +257,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  Maybe<bool> Value::Equals(Local<Context> context, Local<Value> that) const {
    i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate();
    auto self = Utils::OpenHandle(this);
-@@ -5041,6 +5086,10 @@ bool String::ContainsOnlyOneByte() const {
+@@ -5033,6 +5078,10 @@ bool String::ContainsOnlyOneByte() const {
    return helper.Check(*str);
  }
  
@@ -268,7 +268,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  int String::Utf8Length(Isolate* isolate) const {
    i::Handle<i::String> str = Utils::OpenHandle(this);
    str = i::String::Flatten(reinterpret_cast<i::Isolate*>(isolate), str);
-@@ -5193,6 +5242,14 @@ static int WriteUtf8Impl(i::Vector<const Char> string, char* write_start,
+@@ -5185,6 +5234,14 @@ static int WriteUtf8Impl(i::Vector<const Char> string, char* write_start,
  }
  }  // anonymous namespace
  
@@ -283,7 +283,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity,
                        int* nchars_ref, int options) const {
    i::Handle<i::String> str = Utils::OpenHandle(this);
-@@ -5231,6 +5288,17 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string,
+@@ -5223,6 +5280,17 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string,
    return end - start;
  }
  
@@ -301,7 +301,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start,
                           int length, int options) const {
    return WriteHelper(reinterpret_cast<i::Isolate*>(isolate), this, buffer,
-@@ -6140,6 +6208,11 @@ MaybeLocal<String> String::NewFromTwoByte(Isolate* isolate,
+@@ -6132,6 +6200,11 @@ MaybeLocal<String> String::NewFromTwoByte(Isolate* isolate,
    return result;
  }
  
@@ -313,7 +313,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  Local<String> v8::String::Concat(Isolate* v8_isolate, Local<String> left,
                                   Local<String> right) {
    i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -6409,6 +6482,10 @@ bool v8::BooleanObject::ValueOf() const {
+@@ -6401,6 +6474,10 @@ bool v8::BooleanObject::ValueOf() const {
    return jsvalue->value().IsTrue(isolate);
  }
  
@@ -324,7 +324,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate,
                                         Local<String> value) {
    i::Handle<i::String> string = Utils::OpenHandle(*value);
-@@ -8598,6 +8675,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
+@@ -8589,6 +8666,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
    return microtask_queue->IsRunningMicrotasks();
  }
  
@@ -334,7 +334,7 @@ index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c
  String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
      : str_(nullptr), length_(0) {
    if (obj.IsEmpty()) return;
-@@ -8615,6 +8695,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
+@@ -8606,6 +8686,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
  
  String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); }
  

patches/common/v8/export_symbols_needed_for_windows_build.patch

@@ -5,11 +5,11 @@ Subject: Export symbols needed for Windows build
 
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
-diff --git a/src/objects.h b/src/objects.h
+diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 16f5ff3d192016df9d3f8687a9978854fd916d64..5a2f0e02b2e4ab4c5ab8edd9d1dccfd7a2ad5e3a 100644
+index 857f3ed0f6d537cd648f23f04a0ab4c28cce1f96..14c73a0425b4e1e677426eee929910add5615201 100644
---- a/src/objects.h
+--- a/src/objects/objects.h
-+++ b/src/objects.h
++++ b/src/objects/objects.h
-@@ -803,7 +803,7 @@ enum class KeyCollectionMode {
+@@ -791,7 +791,7 @@ enum class KeyCollectionMode {
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
@@ -19,7 +19,7 @@ index 16f5ff3d192016df9d3f8687a9978854fd916d64..5a2f0e02b2e4ab4c5ab8edd9d1dccfd7
    explicit inline Relocatable(Isolate* isolate);
    inline virtual ~Relocatable();
 diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
-index 16db56818e5074e35cbb65b34219786c4cfe0d51..b14b8b44cedad707e99d175c9f63a1472ebe3c6e 100644
+index a83109ed90fa4544939c3825c3a78856f41128a6..06459f407fb99218490a132bd1c5df859cbf2b3c 100644
 --- a/src/objects/ordered-hash-table.h
 +++ b/src/objects/ordered-hash-table.h
 @@ -60,7 +60,7 @@ namespace internal {

patches/common/v8/expose_mksnapshot.patch

@@ -6,15 +6,15 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 62fb301fd3e708d093e052916da98af99ed76597..315c7079ed488461a456aff799b4d1f17b896150 100644
+index 01ef8b8420cb951db372753a4d8b9e987cfb237c..560357a7c219edaa097697e616d5c04a2e86e2d8 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -3787,8 +3787,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3795,8 +3795,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
 -    visibility = [ ":*" ]  # Only targets in this file can depend on this.
 -
      sources = [
-       "src/snapshot/embedded-file-writer.cc",
+       "src/snapshot/embedded/embedded-file-writer.cc",
-       "src/snapshot/embedded-file-writer.h",
+       "src/snapshot/embedded/embedded-file-writer.h",

patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch

@@ -1,560 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <jeremya@chromium.org>
-Date: Mon, 15 Apr 2019 18:06:12 -0700
-Subject: Revert "[cctest] Add V8_EXPORT_PRIVATE to arm/arm64 ports"
-
-This reverts commit 1a7d847cfac9a7363c59c980e47a7b7ff416e6da.
-
-diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
-index e3b079c32e8f8a29abfe117cba44d3b75f53c49d..e85d0108effe3abb3b88a1a41cce0234751759ef 100644
---- a/src/arm/assembler-arm.h
-+++ b/src/arm/assembler-arm.h
-@@ -79,7 +79,7 @@ enum Coprocessor {
- // Machine instruction Operands
- 
- // Class Operand represents a shifter operand in data processing instructions
--class V8_EXPORT_PRIVATE Operand {
-+class Operand {
-  public:
-   // immediate
-   V8_INLINE explicit Operand(int32_t immediate,
-@@ -185,8 +185,9 @@ class V8_EXPORT_PRIVATE Operand {
-   friend class Assembler;
- };
- 
-+
- // Class MemOperand represents a memory operand in load and store instructions
--class V8_EXPORT_PRIVATE MemOperand {
-+class MemOperand {
-  public:
-   // [rn +/- offset]      Offset/NegOffset
-   // [rn +/- offset]!     PreIndex/NegPreIndex
-@@ -242,9 +243,10 @@ class V8_EXPORT_PRIVATE MemOperand {
-   friend class Assembler;
- };
- 
-+
- // Class NeonMemOperand represents a memory operand in load and
- // store NEON instructions
--class V8_EXPORT_PRIVATE NeonMemOperand {
-+class NeonMemOperand {
-  public:
-   // [rn {:align}]       Offset
-   // [rn {:align}]!      PostIndex
-@@ -265,6 +267,7 @@ class V8_EXPORT_PRIVATE NeonMemOperand {
-   int align_;
- };
- 
-+
- // Class NeonListOperand represents a list of NEON registers
- class NeonListOperand {
-  public:
-@@ -1391,7 +1394,7 @@ class PatchingAssembler : public Assembler {
- // state, even if the list is modified by some other means. Note that this scope
- // can be nested but the destructors need to run in the opposite order as the
- // constructors. We do not have assertions for this.
--class V8_EXPORT_PRIVATE UseScratchRegisterScope {
-+class UseScratchRegisterScope {
-  public:
-   explicit UseScratchRegisterScope(Assembler* assembler);
-   ~UseScratchRegisterScope();
-diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
-index 2492f30278adae9fb3ff9e995cb9328b4ae8694c..f0ac332c21eb1172324f728c74ae40e131763fd1 100644
---- a/src/arm64/assembler-arm64.h
-+++ b/src/arm64/assembler-arm64.h
-@@ -49,7 +49,7 @@ class Immediate {
-   RelocInfo::Mode rmode() const { return rmode_; }
- 
-  private:
--  V8_EXPORT_PRIVATE void InitializeHandle(Handle<HeapObject> value);
-+  void InitializeHandle(Handle<HeapObject> value);
- 
-   int64_t value_;
-   RelocInfo::Mode rmode_;
-diff --git a/src/arm64/decoder-arm64.h b/src/arm64/decoder-arm64.h
-index 477a126344a50eb9cf29cce216792a53ae98393e..a89bf38980e711c16caaf7a0158e36480b8ba978 100644
---- a/src/arm64/decoder-arm64.h
-+++ b/src/arm64/decoder-arm64.h
-@@ -86,7 +86,7 @@ namespace internal {
- 
- // The Visitor interface. Disassembler and simulator (and other tools)
- // must provide implementations for all of these functions.
--class V8_EXPORT_PRIVATE DecoderVisitor {
-+class DecoderVisitor {
-  public:
-   virtual ~DecoderVisitor() {}
- 
-@@ -95,8 +95,9 @@ class V8_EXPORT_PRIVATE DecoderVisitor {
-   #undef DECLARE
- };
- 
-+
- // A visitor that dispatches to a list of visitors.
--class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor {
-+class DispatchingDecoderVisitor : public DecoderVisitor {
-  public:
-   DispatchingDecoderVisitor() {}
-   virtual ~DispatchingDecoderVisitor() {}
-@@ -141,6 +142,7 @@ class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor {
-   std::list<DecoderVisitor*> visitors_;
- };
- 
-+
- template<typename V>
- class Decoder : public V {
-  public:
-diff --git a/src/arm64/disasm-arm64.h b/src/arm64/disasm-arm64.h
-index 8e218b5cf80635ddfdef03c3366e692e5ec01c15..0edb2ea58343af0aab71f8e79310270f9e847914 100644
---- a/src/arm64/disasm-arm64.h
-+++ b/src/arm64/disasm-arm64.h
-@@ -14,7 +14,8 @@
- namespace v8 {
- namespace internal {
- 
--class V8_EXPORT_PRIVATE DisassemblingDecoder : public DecoderVisitor {
-+
-+class DisassemblingDecoder : public DecoderVisitor {
-  public:
-   DisassemblingDecoder();
-   DisassemblingDecoder(char* text_buffer, int buffer_size);
-@@ -79,7 +80,8 @@ class V8_EXPORT_PRIVATE DisassemblingDecoder : public DecoderVisitor {
-   bool own_buffer_;
- };
- 
--class V8_EXPORT_PRIVATE PrintDisassembler : public DisassemblingDecoder {
-+
-+class PrintDisassembler : public DisassemblingDecoder {
-  public:
-   explicit PrintDisassembler(FILE* stream) : stream_(stream) { }
-   ~PrintDisassembler() { }
-@@ -90,6 +92,7 @@ class V8_EXPORT_PRIVATE PrintDisassembler : public DisassemblingDecoder {
-   FILE *stream_;
- };
- 
-+
- }  // namespace internal
- }  // namespace v8
- 
-diff --git a/src/arm64/instructions-arm64-constants.cc b/src/arm64/instructions-arm64-constants.cc
-index 5c0d42a8c633738e2cae777114fde7aa8671a556..7559946cb165ec1fd8c1cfd0c9bd77cc0d582f86 100644
---- a/src/arm64/instructions-arm64-constants.cc
-+++ b/src/arm64/instructions-arm64-constants.cc
-@@ -4,7 +4,6 @@
- 
- #include <cstdint>
- #include "include/v8config.h"
--#include "src/base/macros.h"
- 
- namespace v8 {
- namespace internal {
-@@ -29,25 +28,23 @@ extern "C" {
- 
- extern const uint16_t kFP16PositiveInfinity = 0x7C00;
- extern const uint16_t kFP16NegativeInfinity = 0xFC00;
--V8_EXPORT_PRIVATE extern const uint32_t kFP32PositiveInfinity = 0x7F800000;
--V8_EXPORT_PRIVATE extern const uint32_t kFP32NegativeInfinity = 0xFF800000;
--V8_EXPORT_PRIVATE extern const uint64_t kFP64PositiveInfinity =
--    0x7FF0000000000000UL;
--V8_EXPORT_PRIVATE extern const uint64_t kFP64NegativeInfinity =
--    0xFFF0000000000000UL;
-+extern const uint32_t kFP32PositiveInfinity = 0x7F800000;
-+extern const uint32_t kFP32NegativeInfinity = 0xFF800000;
-+extern const uint64_t kFP64PositiveInfinity = 0x7FF0000000000000UL;
-+extern const uint64_t kFP64NegativeInfinity = 0xFFF0000000000000UL;
- 
- // This value is a signalling NaN as both a double and as a float (taking the
- // least-significant word).
--V8_EXPORT_PRIVATE extern const uint64_t kFP64SignallingNaN = 0x7FF000007F800001;
--V8_EXPORT_PRIVATE extern const uint32_t kFP32SignallingNaN = 0x7F800001;
-+extern const uint64_t kFP64SignallingNaN = 0x7FF000007F800001;
-+extern const uint32_t kFP32SignallingNaN = 0x7F800001;
- 
- // A similar value, but as a quiet NaN.
--V8_EXPORT_PRIVATE extern const uint64_t kFP64QuietNaN = 0x7FF800007FC00001;
--V8_EXPORT_PRIVATE extern const uint32_t kFP32QuietNaN = 0x7FC00001;
-+extern const uint64_t kFP64QuietNaN = 0x7FF800007FC00001;
-+extern const uint32_t kFP32QuietNaN = 0x7FC00001;
- 
- // The default NaN values (for FPCR.DN=1).
--V8_EXPORT_PRIVATE extern const uint64_t kFP64DefaultNaN = 0x7FF8000000000000UL;
--V8_EXPORT_PRIVATE extern const uint32_t kFP32DefaultNaN = 0x7FC00000;
-+extern const uint64_t kFP64DefaultNaN = 0x7FF8000000000000UL;
-+extern const uint32_t kFP32DefaultNaN = 0x7FC00000;
- extern const uint16_t kFP16DefaultNaN = 0x7E00;
- 
- #if defined(V8_OS_WIN)
-diff --git a/src/arm64/instructions-arm64.h b/src/arm64/instructions-arm64.h
-index 8514469227042b5740da73d42fc210a2282414e4..6f46e4b88c2e7c77f6fd58567e9aa2ae31a54246 100644
---- a/src/arm64/instructions-arm64.h
-+++ b/src/arm64/instructions-arm64.h
-@@ -26,23 +26,23 @@ extern "C" {
- 
- extern const float16 kFP16PositiveInfinity;
- extern const float16 kFP16NegativeInfinity;
--V8_EXPORT_PRIVATE extern const float kFP32PositiveInfinity;
--V8_EXPORT_PRIVATE extern const float kFP32NegativeInfinity;
--V8_EXPORT_PRIVATE extern const double kFP64PositiveInfinity;
--V8_EXPORT_PRIVATE extern const double kFP64NegativeInfinity;
-+extern const float kFP32PositiveInfinity;
-+extern const float kFP32NegativeInfinity;
-+extern const double kFP64PositiveInfinity;
-+extern const double kFP64NegativeInfinity;
- 
- // This value is a signalling NaN as both a double and as a float (taking the
- // least-significant word).
--V8_EXPORT_PRIVATE extern const double kFP64SignallingNaN;
--V8_EXPORT_PRIVATE extern const float kFP32SignallingNaN;
-+extern const double kFP64SignallingNaN;
-+extern const float kFP32SignallingNaN;
- 
- // A similar value, but as a quiet NaN.
--V8_EXPORT_PRIVATE extern const double kFP64QuietNaN;
--V8_EXPORT_PRIVATE extern const float kFP32QuietNaN;
-+extern const double kFP64QuietNaN;
-+extern const float kFP32QuietNaN;
- 
- // The default NaN values (for FPCR.DN=1).
--V8_EXPORT_PRIVATE extern const double kFP64DefaultNaN;
--V8_EXPORT_PRIVATE extern const float kFP32DefaultNaN;
-+extern const double kFP64DefaultNaN;
-+extern const float kFP32DefaultNaN;
- extern const float16 kFP16DefaultNaN;
- 
- #if defined(V8_OS_WIN)
-@@ -401,11 +401,11 @@ class Instruction {
-   // Find the PC offset encoded in this instruction. 'this' may be a branch or
-   // a PC-relative addressing instruction.
-   // The offset returned is unscaled.
--  V8_EXPORT_PRIVATE int64_t ImmPCOffset();
-+  int64_t ImmPCOffset();
- 
-   // Find the target of this instruction. 'this' may be a branch or a
-   // PC-relative addressing instruction.
--  V8_EXPORT_PRIVATE Instruction* ImmPCOffsetTarget();
-+  Instruction* ImmPCOffsetTarget();
- 
-   static bool IsValidImmPCOffset(ImmBranchType branch_type, ptrdiff_t offset);
-   bool IsTargetInImmPCOffsetRange(Instruction* target);
-diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h
-index d345475f18a671879bcf6f5e9063cbcd5b20241b..c607496b373c27b9002c09b5c6d896fc18cf6a92 100644
---- a/src/arm64/macro-assembler-arm64.h
-+++ b/src/arm64/macro-assembler-arm64.h
-@@ -2082,7 +2082,7 @@ class InstructionAccurateScope {
- // original state, even if the lists were modified by some other means. Note
- // that this scope can be nested but the destructors need to run in the opposite
- // order as the constructors. We do not have assertions for this.
--class V8_EXPORT_PRIVATE UseScratchRegisterScope {
-+class UseScratchRegisterScope {
-  public:
-   explicit UseScratchRegisterScope(TurboAssembler* tasm)
-       : available_(tasm->TmpList()),
-@@ -2110,8 +2110,7 @@ class V8_EXPORT_PRIVATE UseScratchRegisterScope {
-   VRegister AcquireSameSizeAs(const VRegister& reg);
- 
-  private:
--  static CPURegister AcquireNextAvailable(
--      CPURegList* available);
-+  static CPURegister AcquireNextAvailable(CPURegList* available);
- 
-   // Available scratch registers.
-   CPURegList* available_;     // kRegister
-diff --git a/src/arm64/register-arm64.h b/src/arm64/register-arm64.h
-index 54b927c3f407bfdaf69e8312360da9cd31c159d1..1da32ae6f4f0a9ee082a4e5c4e9871259a14cdef 100644
---- a/src/arm64/register-arm64.h
-+++ b/src/arm64/register-arm64.h
-@@ -316,14 +316,14 @@ VectorFormat ScalarFormatFromLaneSize(int lanesize);
- VectorFormat VectorFormatHalfWidthDoubleLanes(VectorFormat vform);
- VectorFormat VectorFormatFillQ(VectorFormat vform);
- VectorFormat ScalarFormatFromFormat(VectorFormat vform);
--V8_EXPORT_PRIVATE unsigned RegisterSizeInBitsFromFormat(VectorFormat vform);
-+unsigned RegisterSizeInBitsFromFormat(VectorFormat vform);
- unsigned RegisterSizeInBytesFromFormat(VectorFormat vform);
- int LaneSizeInBytesFromFormat(VectorFormat vform);
- unsigned LaneSizeInBitsFromFormat(VectorFormat vform);
- int LaneSizeInBytesLog2FromFormat(VectorFormat vform);
--V8_EXPORT_PRIVATE int LaneCountFromFormat(VectorFormat vform);
-+int LaneCountFromFormat(VectorFormat vform);
- int MaxLaneCountFromFormat(VectorFormat vform);
--V8_EXPORT_PRIVATE bool IsVectorFormat(VectorFormat vform);
-+bool IsVectorFormat(VectorFormat vform);
- int64_t MaxIntFromFormat(VectorFormat vform);
- int64_t MinIntFromFormat(VectorFormat vform);
- uint64_t MaxUintFromFormat(VectorFormat vform);
-@@ -529,7 +529,7 @@ bool AreAliased(const CPURegister& reg1, const CPURegister& reg2,
- // same size, and are of the same type. The system stack pointer may be
- // specified. Arguments set to NoReg are ignored, as are any subsequent
- // arguments. At least one argument (reg1) must be valid (not NoCPUReg).
--V8_EXPORT_PRIVATE bool AreSameSizeAndType(
-+bool AreSameSizeAndType(
-     const CPURegister& reg1, const CPURegister& reg2 = NoCPUReg,
-     const CPURegister& reg3 = NoCPUReg, const CPURegister& reg4 = NoCPUReg,
-     const CPURegister& reg5 = NoCPUReg, const CPURegister& reg6 = NoCPUReg,
-@@ -546,10 +546,9 @@ bool AreSameFormat(const VRegister& reg1, const VRegister& reg2,
- // consecutive in the register file. Arguments may be set to NoVReg, and if so,
- // subsequent arguments must also be NoVReg. At least one argument (reg1) must
- // be valid (not NoVReg).
--V8_EXPORT_PRIVATE bool AreConsecutive(const VRegister& reg1,
--                                      const VRegister& reg2,
--                                      const VRegister& reg3 = NoVReg,
--                                      const VRegister& reg4 = NoVReg);
-+bool AreConsecutive(const VRegister& reg1, const VRegister& reg2,
-+                    const VRegister& reg3 = NoVReg,
-+                    const VRegister& reg4 = NoVReg);
- 
- typedef VRegister FloatRegister;
- typedef VRegister DoubleRegister;
-@@ -557,7 +556,7 @@ typedef VRegister Simd128Register;
- 
- // -----------------------------------------------------------------------------
- // Lists of registers.
--class V8_EXPORT_PRIVATE CPURegList {
-+class CPURegList {
-  public:
-   template <typename... CPURegisters>
-   explicit CPURegList(CPURegister reg0, CPURegisters... regs)
-diff --git a/src/arm64/simulator-arm64.h b/src/arm64/simulator-arm64.h
-index 2a5e25518badddd77febee11debdfb90868f8b8b..673ff8710cabad467fc08556ab96d3737c6d3e03 100644
---- a/src/arm64/simulator-arm64.h
-+++ b/src/arm64/simulator-arm64.h
-@@ -656,11 +656,10 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
-     USE(size);
-   }
- 
--  V8_EXPORT_PRIVATE explicit Simulator(
--      Decoder<DispatchingDecoderVisitor>* decoder, Isolate* isolate = nullptr,
--      FILE* stream = stderr);
-+  explicit Simulator(Decoder<DispatchingDecoderVisitor>* decoder,
-+                     Isolate* isolate = nullptr, FILE* stream = stderr);
-   Simulator();
--  V8_EXPORT_PRIVATE ~Simulator();
-+  ~Simulator();
- 
-   // System functions.
- 
-@@ -745,7 +744,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
-   // Accessor to the internal simulator stack area.
-   uintptr_t StackLimit(uintptr_t c_limit) const;
- 
--  V8_EXPORT_PRIVATE void ResetState();
-+  void ResetState();
- 
-   void DoRuntimeCall(Instruction* instr);
- 
-@@ -753,7 +752,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
-   static const Instruction* kEndOfSimAddress;
-   void DecodeInstruction();
-   void Run();
--  V8_EXPORT_PRIVATE void RunFrom(Instruction* start);
-+  void RunFrom(Instruction* start);
- 
-   // Simulation helpers.
-   template <typename T>
-diff --git a/src/arm64/utils-arm64.h b/src/arm64/utils-arm64.h
-index 00ed1c20c31bd312fe02920713fb0b937f1fa30e..f57dc861731c5146e26702147841a75dd045efd8 100644
---- a/src/arm64/utils-arm64.h
-+++ b/src/arm64/utils-arm64.h
-@@ -33,8 +33,8 @@ int float16classify(float16 value);
- // Bit counting.
- int CountLeadingZeros(uint64_t value, int width);
- int CountLeadingSignBits(int64_t value, int width);
--V8_EXPORT_PRIVATE int CountTrailingZeros(uint64_t value, int width);
--V8_EXPORT_PRIVATE int CountSetBits(uint64_t value, int width);
-+int CountTrailingZeros(uint64_t value, int width);
-+int CountSetBits(uint64_t value, int width);
- int LowestSetBitPosition(uint64_t value);
- int HighestSetBitPosition(uint64_t value);
- uint64_t LargestPowerOf2Divisor(uint64_t value);
-diff --git a/src/codegen/code-comments.h b/src/codegen/code-comments.h
-index f366cd5547885d9e5dca19dd9177322dc375fa7c..fb4d47b6ec4e8982951e96f0226dbaf25185545c 100644
---- a/src/codegen/code-comments.h
-+++ b/src/codegen/code-comments.h
-@@ -35,7 +35,7 @@ struct CodeCommentEntry {
- 
- class CodeCommentsWriter {
-  public:
--  V8_EXPORT_PRIVATE void Add(uint32_t pc_offset, std::string comment);
-+  void Add(uint32_t pc_offset, std::string comment);
-   void Emit(Assembler* assm);
-   size_t entry_count() const;
-   uint32_t section_size() const;
-diff --git a/src/diagnostics/disasm.h b/src/diagnostics/disasm.h
-index 2fe14f19321c67aaf1dd388472b14c8b5fbfe400..fcc38eb3b2242ce65f872636b9121c66f94b987a 100644
---- a/src/diagnostics/disasm.h
-+++ b/src/diagnostics/disasm.h
-@@ -14,7 +14,7 @@ typedef unsigned char byte;
- // Interface and default implementation for converting addresses and
- // register-numbers to text.  The default implementation is machine
- // specific.
--class V8_EXPORT_PRIVATE NameConverter {
-+class NameConverter {
-  public:
-   virtual ~NameConverter() = default;
-   virtual const char* NameOfCPURegister(int reg) const;
-@@ -34,6 +34,7 @@ class V8_EXPORT_PRIVATE NameConverter {
-   v8::internal::EmbeddedVector<char, 128> tmp_buffer_;
- };
- 
-+
- // A generic Disassembler interface
- class Disassembler {
-  public:
-@@ -55,8 +56,7 @@ class Disassembler {
- 
-   // Writes one disassembled instruction into 'buffer' (0-terminated).
-   // Returns the length of the disassembled machine instruction in bytes.
--  V8_EXPORT_PRIVATE int InstructionDecode(v8::internal::Vector<char> buffer,
--                                          byte* instruction);
-+  int InstructionDecode(v8::internal::Vector<char> buffer, byte* instruction);
- 
-   // Returns -1 if instruction does not mark the beginning of a constant pool,
-   // or the number of entries in the constant pool beginning here.
-diff --git a/src/diagnostics/disassembler.h b/src/diagnostics/disassembler.h
-index db1b8de69b8d0efff6a7f72094e2298a34753b8b..a58702f0d6bb572a666c0261c84c68a57afb390b 100644
---- a/src/diagnostics/disassembler.h
-+++ b/src/diagnostics/disassembler.h
-@@ -20,10 +20,8 @@ class Disassembler : public AllStatic {
-   // Instruction'.
-   // the code object is used for name resolution and may be null.
-   // TODO(titzer): accept a {WasmCodeManager*} if {isolate} is null
--  V8_EXPORT_PRIVATE static int Decode(Isolate* isolate, std::ostream* os,
--                                      byte* begin, byte* end,
--                                      CodeReference code = {},
--                                      Address current_pc = kNullAddress);
-+  static int Decode(Isolate* isolate, std::ostream* os, byte* begin, byte* end,
-+                    CodeReference code = {}, Address current_pc = kNullAddress);
- };
- 
- }  // namespace internal
-diff --git a/src/objects.cc b/src/objects.cc
-index b29e37fa1cc451daafc80a53265fd02346e88220..f425ce8367e7edc050abb48fc2af9ede188ae1c8 100644
---- a/src/objects.cc
-+++ b/src/objects.cc
-@@ -1238,7 +1238,7 @@ bool Object::ToInt32(int32_t* value) {
- // static constexpr object declarations need a definition to make the
- // compiler happy.
- constexpr Object Smi::kZero;
--V8_EXPORT_PRIVATE constexpr Object SharedFunctionInfo::kNoSharedNameSentinel;
-+constexpr Object SharedFunctionInfo::kNoSharedNameSentinel;
- 
- Handle<SharedFunctionInfo> FunctionTemplateInfo::GetOrCreateSharedFunctionInfo(
-     Isolate* isolate, Handle<FunctionTemplateInfo> info,
-diff --git a/src/objects/code.h b/src/objects/code.h
-index a23763d893bda0003016d84b8f6f8d2c21365fcb..a078d30f2d84e65b087a3bcaf88002f1007a8034 100644
---- a/src/objects/code.h
-+++ b/src/objects/code.h
-@@ -650,10 +650,9 @@ class DependentCode : public WeakFixedArray {
-   };
- 
-   // Register a code dependency of {cell} on {object}.
--  V8_EXPORT_PRIVATE static void InstallDependency(Isolate* isolate,
--                                                  const MaybeObjectHandle& code,
--                                                  Handle<HeapObject> object,
--                                                  DependencyGroup group);
-+  static void InstallDependency(Isolate* isolate, const MaybeObjectHandle& code,
-+                                Handle<HeapObject> object,
-+                                DependencyGroup group);
- 
-   void DeoptimizeDependentCodeGroup(Isolate* isolate, DependencyGroup group);
- 
-diff --git a/src/objects/shared-function-info.h b/src/objects/shared-function-info.h
-index 40d40e182917e4c7b9b6afec70c4735c89d7c5bb..e06c9eb74a8c3b8bbcaab8fb0b1f29d9f981ae46 100644
---- a/src/objects/shared-function-info.h
-+++ b/src/objects/shared-function-info.h
-@@ -221,9 +221,7 @@ class InterpreterData : public Struct {
- class SharedFunctionInfo : public HeapObject {
-  public:
-   NEVER_READ_ONLY_SPACE
--
--  V8_EXPORT_PRIVATE static constexpr Object const kNoSharedNameSentinel =
--      Smi::kZero;
-+  static constexpr Object const kNoSharedNameSentinel = Smi::kZero;
- 
-   // [name]: Returns shared name if it exists or an empty string otherwise.
-   inline String Name() const;
-diff --git a/src/objects/string.cc b/src/objects/string.cc
-index 732dd38e21789c70ada0baa4d7d2bd2232dd83b7..5818701376b2754ffcef4aa4bf859c8b5145e25a 100644
---- a/src/objects/string.cc
-+++ b/src/objects/string.cc
-@@ -1624,8 +1624,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) {
-   UNREACHABLE();
- }
- 
--template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) void String::WriteToFlat(
--    String source, uint16_t* sink, int from, int to);
--
- }  // namespace internal
- }  // namespace v8
-diff --git a/src/objects/string.h b/src/objects/string.h
-index c7e9460904afe50613d811363d5d4c1281796fad..5b152501196c7aff9311f07e7262e4919a3a2a30 100644
---- a/src/objects/string.h
-+++ b/src/objects/string.h
-@@ -6,7 +6,6 @@
- #define V8_OBJECTS_STRING_H_
- 
- #include "src/base/bits.h"
--#include "src/base/export-template.h"
- #include "src/objects/instance-type.h"
- #include "src/objects/name.h"
- #include "src/objects/smi.h"
-@@ -369,8 +368,8 @@ class String : public Name {
- 
-   // Helper function for flattening strings.
-   template <typename sinkchar>
--  EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
--  static void WriteToFlat(String source, sinkchar* sink, int from, int to);
-+  V8_EXPORT_PRIVATE static void WriteToFlat(String source, sinkchar* sink,
-+                                            int from, int to);
- 
-   static inline bool IsAscii(const char* chars, int length) {
-     return IsAscii(reinterpret_cast<const uint8_t*>(chars), length);
-@@ -456,11 +455,6 @@ class String : public Name {
-   OBJECT_CONSTRUCTORS(String, Name);
- };
- 
--// clang-format off
--extern template EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
--void String::WriteToFlat(String source, uint16_t* sink, int from, int to);
--// clang-format on
--
- class SubStringRange {
-  public:
-   inline SubStringRange(String string, const DisallowHeapAllocation& no_gc,
-diff --git a/src/regexp/jsregexp.h b/src/regexp/jsregexp.h
-index 9866caa900888273de74cfb012845748931d0fd0..4c7526a59342743f6068e5c61d24c8dad4efd43f 100644
---- a/src/regexp/jsregexp.h
-+++ b/src/regexp/jsregexp.h
-@@ -1513,8 +1513,7 @@ class RegExpEngine: public AllStatic {
- 
-   static bool TooMuchRegExpCode(Isolate* isolate, Handle<String> pattern);
- 
--  V8_EXPORT_PRIVATE static void DotPrint(const char* label, RegExpNode* node,
--                                         bool ignore_case);
-+  static void DotPrint(const char* label, RegExpNode* node, bool ignore_case);
- };
- 
- 
-diff --git a/src/wasm/wasm-module.h b/src/wasm/wasm-module.h
-index e1184c40b8482891352dbeaad8b49d2c29ec19e2..284e8fae87a90f7056346bc074388270af48914e 100644
---- a/src/wasm/wasm-module.h
-+++ b/src/wasm/wasm-module.h
-@@ -120,7 +120,7 @@ struct WasmElemSegment {
- 
-   // Used in the {entries} vector to represent a `ref.null` entry in a passive
-   // segment.
--  V8_EXPORT_PRIVATE static const uint32_t kNullIndex = ~0u;
-+  static const uint32_t kNullIndex = ~0u;
- 
-   uint32_t table_index;
-   WasmInitExpr offset;
-diff --git a/test/cctest/parsing/test-parse-decision.cc b/test/cctest/parsing/test-parse-decision.cc
-index 37ce657d44d09ce31506bb25fac25ae73fb6fc75..93bfb4776dee9f323b438bcce00194d75547f257 100644
---- a/test/cctest/parsing/test-parse-decision.cc
-+++ b/test/cctest/parsing/test-parse-decision.cc
-@@ -14,7 +14,6 @@
- #include "src/execution/isolate.h"
- #include "src/handles/handles-inl.h"
- #include "src/objects-inl.h"
--#include "src/objects/shared-function-info-inl.h"
- #include "src/utils.h"
- 
- #include "test/cctest/cctest.h"

patches/common/v8/workaround_an_undefined_symbol_error.patch

@@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc
-index 4408a44770bcc5106bc2dd843ef4954dad7ff7df..df9683fd5e9720255ff6b83e47ec64e2f83f7722 100644
+index 770dbd0827f03d40d30b530504ba0900f56011f1..b5e0e706ce2bda34f286c68e55d8ba993c4cf9db 100644
 --- a/src/arm64/assembler-arm64.cc
 +++ b/src/arm64/assembler-arm64.cc
 @@ -4013,6 +4013,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@@ -39,10 +39,10 @@ index 4408a44770bcc5106bc2dd843ef4954dad7ff7df..df9683fd5e9720255ff6b83e47ec64e2
                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
 diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
-index d814722e6a9eb7b156fc86592cd321682bb68974..2492f30278adae9fb3ff9e995cb9328b4ae8694c 100644
+index 4791dcdbc7062a5d222d5c11a9c49c811e0e3fe6..bf69046dc3ff6c773261f2257b5cdb0be6822d52 100644
 --- a/src/arm64/assembler-arm64.h
 +++ b/src/arm64/assembler-arm64.h
-@@ -2230,11 +2230,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2226,11 +2226,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
      return rm.code() << Rm_offset;
    }
  
@@ -55,7 +55,7 @@ index d814722e6a9eb7b156fc86592cd321682bb68974..2492f30278adae9fb3ff9e995cb9328b
  
    static Instr Ra(CPURegister ra) {
      DCHECK_NE(ra.code(), kSPRegInternalCode);
-@@ -2258,15 +2254,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2254,15 +2250,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
  
    // These encoding functions allow the stack pointer to be encoded, and
    // disallow the zero register.

spec/api-menu-spec.js

@@ -835,9 +835,7 @@ describe('Menu module', () => {
     })
   })
 
-  // FIXME(nornagon): this is disabled due to an issue with nan in current v8.
+  describe('menu accelerators', () => {
-  // See https://github.com/electron/electron/issues/18409
-  describe.skip('menu accelerators', () => {
     let testFn = it
     try {
       // We have other tests that check if native modules work, if we fail to require

spec/api-notification-dbus-spec.js

@@ -16,8 +16,7 @@ const { app } = remote
 const skip = process.platform !== 'linux' ||
              process.arch === 'ia32' ||
              process.arch.indexOf('arm') === 0 ||
-             !process.env.DBUS_SESSION_BUS_ADDRESS ||
+             !process.env.DBUS_SESSION_BUS_ADDRESS;
-             true;
 
 (skip ? describe.skip : describe)('Notification module (dbus)', () => {
   let mock, Notification, getCalls, reset

spec/api-power-monitor-spec.js

@@ -14,8 +14,7 @@ const Promise = require('bluebird')
 const { expect } = chai
 chai.use(dirtyChai)
 
-const skip = process.platform !== 'linux' || !process.env.DBUS_SYSTEM_BUS_ADDRESS ||
+const skip = process.platform !== 'linux' || !process.env.DBUS_SYSTEM_BUS_ADDRESS
-             true
 
 describe('powerMonitor', () => {
   let logindMock, dbusMockPowerMonitor, getCalls, emitSignal, reset

spec/api-web-contents-spec.js

@@ -382,9 +382,7 @@ describe('webContents module', () => {
     })
   })
 
-  // FIXME(nornagon): this is disabled due to an issue with nan in current v8.
+  describe('devtools window', () => {
-  // See https://github.com/electron/electron/issues/18409
-  describe.skip('devtools window', () => {
     let testFn = it
     if (process.platform === 'darwin' && isCi) {
       testFn = it.skip