chore: bump chromium to b243c83a66a7fded00f3408107778 (master) (#21827)

Co-authored-by: Robo <hop2deep@gmail.com>

DEPS

@@ -12,7 +12,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    'f707f1d6d428f84cf14b64bc2ca74372e25c6ce7',
+    '8fe78d4711fb243c83a66a7fded00f3408107778',
   'node_version':
     'v12.14.1',
   'nan_version':

electron_paks.gni

@@ -57,6 +57,7 @@ template("electron_extra_paks") {
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
       "$root_gen_dir/content/content_resources.pak",
+      "$root_gen_dir/content/dev_ui_content_resources.pak",
       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
@@ -65,7 +66,8 @@ template("electron_extra_paks") {
     ]
     deps = [
       "//components/resources",
-      "//content:resources",
+      "//content:content_resources",
+      "//content:dev_ui_content_resources",
       "//content/browser/tracing:resources",
       "//electron:resources",
       "//mojo/public/js:resources",

patches/chromium/accelerator.patch

@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= should show as Ctrl-+
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f90bfe5cc6 100644
+index d7b79feb77f3595bcc8617b6e84c566357c336fe..3b1eab14a4348eab79f486aec43783fd8f629a8f 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -31,7 +31,7 @@ index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f9
  
  namespace ui {
  
-@@ -150,7 +149,15 @@ base::string16 Accelerator::GetShortcutText() const {
+@@ -154,7 +153,15 @@ base::string16 Accelerator::GetShortcutText() const {
    shortcut = KeyCodeToName();
  #endif
  
@@ -47,7 +47,7 @@ index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f9
  #if defined(OS_WIN)
      // Our fallback is to try translate the key code to a regular character
      // unless it is one of digits (VK_0 to VK_9). Some keyboard
-@@ -159,21 +166,14 @@ base::string16 Accelerator::GetShortcutText() const {
+@@ -163,21 +170,14 @@ base::string16 Accelerator::GetShortcutText() const {
      // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
      // default zoom level), we leave VK_[0-9] alone without translation.
      wchar_t key;
@@ -75,7 +75,7 @@ index 025a82c14dd379f82e6c8242727346bd21e768f3..8b8b0e77c355acd1ef22fb51b89f65f9
    }
  
  #if defined(OS_MACOSX)
-@@ -356,7 +356,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
+@@ -360,7 +360,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
    // more information.
    if (IsCtrlDown())
      shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);

patches/chromium/blink_file_path.patch

@@ -21,12 +21,12 @@ index 888fb19b976194c173286f92b26c4bc9362bcf9c..9d243bc70089685f018b14eba0025cfd
    // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
    int64_t lastModified() const;
 diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
-index 8113ac9050c25a675eb20c90fdb4d037e171a5b6..9ca2d532dc4694d7a68ebd6b7988907132dae0e9 100644
+index 4339a27e87c12279b2a2f08a7c3d181e7265a986..6aebb1ba4f74a4cfdc546fe5903032f4bc23dd30 100644
 --- a/third_party/blink/renderer/core/fileapi/file.idl
 +++ b/third_party/blink/renderer/core/fileapi/file.idl
 @@ -31,6 +31,7 @@
  ] interface File : Blob {
-     [CallWith=ExecutionContext] constructor(sequence<BlobPart> fileBits, USVString fileName, optional FilePropertyBag options);
+     [CallWith=ExecutionContext] constructor(sequence<BlobPart> fileBits, USVString fileName, optional FilePropertyBag options = {});
      readonly attribute DOMString name;
 +    readonly attribute DOMString path;
      readonly attribute long long lastModified;

patches/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index f7536b085bc5c0fd4853ac905bf7b7c0160d60b7..36303725d92c76581ea91d06674408aa41bbf549 100644
+index 13a7940a11028d7800787a9d4ed1651483bf22a1..ee4b9bb290611b3f3d7c9b2553960e2517a3bf96 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -347,10 +347,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -353,10 +353,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    CHECK(!view_ || !view_->IsAttached());
  
@@ -28,7 +28,7 @@ index f7536b085bc5c0fd4853ac905bf7b7c0160d60b7..36303725d92c76581ea91d06674408aa
    if (!Client())
      return;
  
-@@ -368,6 +364,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -374,6 +370,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
    GetScriptController().ClearForClose();

patches/chromium/blink_world_context.patch

@@ -7,10 +7,10 @@ This exposes a method for obtaining a reference to an isolated world, which is
 otherwise not available in the Blink API.
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 461e1574cd55860ea62a2c7f509a2fdb4134c898..0f45096b984f64fb0c094cd0996a2afbb64ddfb6 100644
+index 0faffef486ac186fe4ce74921ed5b96a62b23937..d6c29028aab0847aca98e0d2294f9a4941cf632b 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -347,6 +347,9 @@ class WebLocalFrame : public WebFrame {
+@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame {
    // be calling this API.
    virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
  
@@ -21,10 +21,10 @@ index 461e1574cd55860ea62a2c7f509a2fdb4134c898..0f45096b984f64fb0c094cd0996a2afb
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 3de275c61ba6d1aa612de9036253906e4eb5638a..3912a5797fad331ab8b754abe9474b63f1a468df 100644
+index b425add4fae51f816b113eec1b604ab719cb4949..789c9a27167428aec98ac340e2d76c6be8a556b9 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -956,6 +956,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -955,6 +955,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
  
@@ -39,10 +39,10 @@ index 3de275c61ba6d1aa612de9036253906e4eb5638a..3912a5797fad331ab8b754abe9474b63
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index 8e28c1d87211567636b9e291c3969bd00c78ff38..585dd302815e51e33e03e3c5db2d3ea1621d0b4b 100644
+index 62b69c655de4337c691c880ddd0c63f9e9af5626..82baab83ec73089688ad3bb24c3a42e106fe4cf3 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -172,6 +172,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -173,6 +173,8 @@ class CORE_EXPORT WebLocalFrameImpl final
        int argc,
        v8::Local<v8::Value> argv[]) override;
    v8::Local<v8::Context> MainWorldScriptContext() const override;

patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 563e07a5ac2d9c44c4484d59e3fc025c70b961ea..60e36fab0e6999688b88665d9ad3181a26525a38 100644
+index 612d83aaa8ec820e5640effab5b96aa37b3205ea..83dbc5037810469e76895e01cc1c3ff0399b0420 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -4369,6 +4369,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4411,6 +4411,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 563e07a5ac2d9c44c4484d59e3fc025c70b961ea..60e36fab0e6999688b88665d9ad3181a
            &no_javascript_access);
  
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index fb4cdca43e59c2dd8156cbe12bec391b128a6dd9..5c3645bebf2009def133fcd845f50e7745a243ca 100644
+index dce2284977bf3d8fba00e6488d51fd6bfa1cb3b0..afeebca6b6fd01294acbf62aa6a7eaf43151b9e6 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -302,6 +302,10 @@ struct CreateNewWindowParams {
+@@ -305,6 +305,10 @@ struct CreateNewWindowParams {
  
    // The window features to use for the new window.
    blink.mojom.WindowFeatures features;
@@ -36,10 +36,10 @@ index fb4cdca43e59c2dd8156cbe12bec391b128a6dd9..5c3645bebf2009def133fcd845f50e77
  
  // 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 0788e0f5e4311d8978768cb0d4d09736c19d2d25..0baf2ab441d48ee32a3ccf40fbc73c2c5cbcea2a 100644
+index a6042e5b21c77b27a3df77db3da321943f4c190d..38409b9d1ce06c2a73ce2feb98a6be35325ca472 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -501,6 +501,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -505,6 +505,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -49,10 +49,10 @@ index 0788e0f5e4311d8978768cb0d4d09736c19d2d25..0baf2ab441d48ee32a3ccf40fbc73c2c
      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 16c89377db5909ace2d12281a5ad4db49076e805..3a32228e8c131468c535f3586b1c54b307062c42 100644
+index 8256cd888b4c2af893fb98c3f5c77641eaa6c70b..af7c11bfbb26894ba4eb97b3fcbb026af288c084 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -139,6 +139,7 @@ class NetworkService;
+@@ -145,6 +145,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -60,7 +60,7 @@ index 16c89377db5909ace2d12281a5ad4db49076e805..3a32228e8c131468c535f3586b1c54b3
  }  // namespace network
  
  namespace rappor {
-@@ -824,6 +825,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -830,6 +831,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -70,7 +70,7 @@ index 16c89377db5909ace2d12281a5ad4db49076e805..3a32228e8c131468c535f3586b1c54b3
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 23ea7af344a1eaca2d0301cee9fe4bedde57b93a..37ac96bb7d42fe4caeb31861875219079d986982 100644
+index 596e71dee6b6591f96d1e772e167577c24aa87f8..6820d5aabc8dfcb01e8a10b7b3fe94a35b3468a6 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -69,6 +69,7 @@
@@ -81,7 +81,7 @@ index 23ea7af344a1eaca2d0301cee9fe4bedde57b93a..37ac96bb7d42fe4caeb3186187521907
  #include "content/renderer/media/audio/audio_device_factory.h"
  #include "content/renderer/render_frame_impl.h"
  #include "content/renderer/render_frame_proxy.h"
-@@ -1294,6 +1295,8 @@ WebView* RenderViewImpl::CreateView(
+@@ -1278,6 +1279,8 @@ WebView* RenderViewImpl::CreateView(
    }
    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
  
@@ -91,10 +91,10 @@ index 23ea7af344a1eaca2d0301cee9fe4bedde57b93a..37ac96bb7d42fe4caeb3186187521907
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index 4497b2d0c264f3e8ebc05230bdc117b6abccc23b..2eaa105035208d92cdcfe0e4de2a62ebbce1414b 100644
+index 62ae14ae5562cb6c94d106b92f6b422b02d63b3c..fed91002d1998ec20449d07c2ca98f75fe190dda 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -326,6 +326,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -322,6 +322,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,

patches/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 0a1227d51c2413ec8467932cea294b988899778a..3ac22203ce7e435f0a31fe60e2605cb7ed074a86 100644
+index 1d417ce9405fd65b17137c01468d99eba7fa0e76..1f893cbbc248ac34b4f28d58e5cf9a20ddf29b7a 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
 @@ -1250,8 +1250,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(

patches/chromium/disable_color_correct_rendering.patch

@@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 9fc38f2d65ad283d9ca4c8360c0e471048e4abd3..97d93b6b2500f9489cf6e9bf4c995cd154083352 100644
+index 67453e2ee063d89534cb7489800144fb0c078fa4..14f7b45125db928fa293f8f2ee3e7993c98e1fcc 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
 @@ -1804,6 +1804,12 @@ const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpace() const {
@@ -232,7 +232,7 @@ index 20a2cae2de196aede4314e0a94638fdc5be04b75..160092c7e996d0f0232eda91e7a62bb7
      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 cd0bc10cda20c0f874d9c315ee16860255287631..0b0529f7000ced635df3442409056f79086b0c53 100644
+index c481a1b984d43e86bb72a319cc5cc75dd7efc0fa..b9da220b57ef3300461c7effed30c961493e296a 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -228,6 +228,7 @@
@@ -243,7 +243,7 @@ index cd0bc10cda20c0f874d9c315ee16860255287631..0b0529f7000ced635df3442409056f79
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  #include "url/origin.h"
-@@ -3059,6 +3060,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3080,6 +3081,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[] = {

patches/chromium/disable_hidden.patch

@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index cb19c7f0fb1fbda6e0b84062e4754622123e05e8..dc7169488b75972a22ed82eef564f8290be4ba36 100644
+index 5903e48135ff28a46267a0c4790798fd0fae70f9..8a63a103a897f9752cb06c44921f05404f71d2c9 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -614,6 +614,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -613,6 +613,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  

patches/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 9a3490d84c0bc695f06a4e7950b1c212ec855443..a2efb0da7da4048d282bd4ab595b565b31dc1a06 100644
+index 17a954218ac69165267d3ee9a060f1c49a7ebd11..786972652f715c6c2b969a77f237a22c5b0ac180 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -3862,7 +3862,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
+@@ -3850,7 +3850,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/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -61,10 +61,10 @@ index 95679ab2915ad496ca0018aa13874b84eb11d7fd..c278e0fc072409677beafc7f252ebcf6
    //
    // Returns the current WebKit preferences. Note: WebPreferences is cached, so
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 37ac96bb7d42fe4caeb31861875219079d986982..d4b3d0f71ea6bc6aa9b927f32ee09eb9732c46c7 100644
+index 6820d5aabc8dfcb01e8a10b7b3fe94a35b3468a6..94000dacdccfd83b3e218521918ed400f54979e1 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -1210,6 +1210,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
+@@ -1194,6 +1194,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
    IPC_BEGIN_MESSAGE_MAP(RenderViewImpl, message)
      IPC_MESSAGE_HANDLER(ViewMsg_SetPageScale, OnSetPageScale)
      IPC_MESSAGE_HANDLER(ViewMsg_SetInitialFocus, OnSetInitialFocus)
@@ -73,7 +73,7 @@ index 37ac96bb7d42fe4caeb31861875219079d986982..d4b3d0f71ea6bc6aa9b927f32ee09eb9
      IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck)
      IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences)
      IPC_MESSAGE_HANDLER(ViewMsg_ClosePage, OnClosePage)
-@@ -1800,6 +1802,12 @@ void RenderViewImpl::OnSetPageScale(float page_scale_factor) {
+@@ -1750,6 +1752,12 @@ void RenderViewImpl::OnSetPageScale(float page_scale_factor) {
    webview()->SetPageScaleFactor(page_scale_factor);
  }
  
@@ -87,10 +87,10 @@ index 37ac96bb7d42fe4caeb31861875219079d986982..d4b3d0f71ea6bc6aa9b927f32ee09eb9
      PageVisibilityState visibility_state,
      bool initial_setting) {
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index a6768059fb7e91115f4659f236f096d264977408..a5954b581e06f78d364f4525f1550f7f13c836ec 100644
+index 7c9264c7ade06893918010f7fe235df6243b9ab6..15ad1af9a8b02a02f80bd11bf3d2d0131c7a24b9 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
-@@ -452,6 +452,7 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
+@@ -440,6 +440,7 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
    void OnSetInitialFocus(bool reverse);
    void OnSetRendererPrefs(
        const blink::mojom::RendererPreferences& renderer_prefs);

patches/chromium/fixme_grit_conflicts.patch

@@ -10,10 +10,10 @@ Should be removed once grit is fixed.
 Tracking bug: https://crbug.com/1040605
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 9f66e1221eda1fbb6e86a4d7541e07d222512171..f47f8edb54984f7497e7c69e2565abc83f58dc8b 100644
+index 281353014818f6564f184e069be32af6b6e0f78f..47de0dca640c7d55436702c47dd3b2d634fd480d 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -569,15 +569,16 @@
+@@ -572,15 +572,16 @@
      "includes": [3840],
    },
  

patches/chromium/frame_host_manager.patch

@@ -42,10 +42,10 @@ index 906a1ee4ac58b0744a32153bbaafeac4322a60e4..c90f4aead36cbf3767dc5094728963c2
    // another SiteInstance for the same site.
    void RegisterSiteInstance(SiteInstanceImpl* site_instance);
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index a9502e1bb1be5e67bbec201405dd0995770444cb..654dfa5b3a1572dd741390a0ad1612b50e4552cd 100644
+index ce0b1ae151e22cde1f0a3127e08b14d4043567be..53d584727b5a7b4675165e23e35f13500a80ddd0 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -1186,6 +1186,24 @@ void NavigationRequest::BeginNavigation() {
+@@ -1198,6 +1198,24 @@ void NavigationRequest::BeginNavigation() {
      TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationRequest", this,
                                   "ResponseStarted");
  
@@ -71,10 +71,10 @@ index a9502e1bb1be5e67bbec201405dd0995770444cb..654dfa5b3a1572dd741390a0ad1612b5
      render_frame_host_ =
          frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
 diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
-index 5042925bf761245b3ab42e83b009190b390e33ab..913245edf9d64bb6bdbee5e96493ad5b8e5cde0a 100644
+index 0ce2a4fec90f91e9098fb033f885c37221c3723a..a13fa98055f452f2db67bd00bc3f06c2479cab8a 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
-@@ -2129,6 +2129,16 @@ bool RenderFrameHostManager::InitRenderView(
+@@ -2137,6 +2137,16 @@ bool RenderFrameHostManager::InitRenderView(
  scoped_refptr<SiteInstance>
  RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      NavigationRequest* request) {
@@ -91,7 +91,7 @@ index 5042925bf761245b3ab42e83b009190b390e33ab..913245edf9d64bb6bdbee5e96493ad5b
    SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
  
    // All children of MHTML documents must be MHTML documents. They all live in
-@@ -2148,10 +2158,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2156,10 +2166,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
    //
    // TODO(clamy): We should also consider as a candidate SiteInstance the
    // speculative SiteInstance that was computed on redirects.
@@ -156,7 +156,7 @@ index 5042925bf761245b3ab42e83b009190b390e33ab..913245edf9d64bb6bdbee5e96493ad5b
  
    scoped_refptr<SiteInstance> dest_site_instance = GetSiteInstanceForNavigation(
        request->common_params().url, request->GetSourceSiteInstance(),
-@@ -2161,6 +2221,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2169,6 +2229,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
        request->GetRestoreType() != RestoreType::NONE, request->is_view_source(),
        request->WasServerRedirect());
  
@@ -194,7 +194,7 @@ index caa100b3889e17a9afdc8127e0e13bb6b86e8042..f08d3a2eb28f0f6fff89b5759eff5369
    size_t GetRelatedActiveContentsCount() override;
    bool RequiresDedicatedProcess() override;
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 0baf2ab441d48ee32a3ccf40fbc73c2c5cbcea2a..b1646da3383f1799ff47900a00da333d1bdabff3 100644
+index 38409b9d1ce06c2a73ce2feb98a6be35325ca472..34b8ba27caf5a2d521e94055c440cd31fc9925c7 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -50,6 +50,21 @@
@@ -220,10 +220,10 @@ index 0baf2ab441d48ee32a3ccf40fbc73c2c5cbcea2a..b1646da3383f1799ff47900a00da333d
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 3a32228e8c131468c535f3586b1c54b307062c42..835cdff288ddf57674d5cc44ea2aaacf6facd03d 100644
+index af7c11bfbb26894ba4eb97b3fcbb026af288c084..ccf5aee27ed7aa4bd0b54149f24df8f075c0186d 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -226,8 +226,45 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -232,8 +232,45 @@ class CONTENT_EXPORT ContentBrowserClient {
    using IsClipboardPasteAllowedCallback =
        base::OnceCallback<void(ClipboardPasteAllowed)>;
  

patches/chromium/gritsettings_resource_ids.patch

@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index df4c6325986bee4642672ecd8a964a69fcee7681..9f66e1221eda1fbb6e86a4d7541e07d222512171 100644
+index 7dfaa6cc17cf2107bedc84cfa60b59895d201a83..281353014818f6564f184e069be32af6b6e0f78f 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -575,6 +575,11 @@
+@@ -578,6 +578,11 @@
      "includes": [3860],
    },
  

patches/chromium/mas-cgdisplayusesforcetogray.patch

@@ -6,13 +6,13 @@ Subject: mas-cgdisplayusesforcetogray.patch
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index b19c27fe7ec208e53bbff9c9901f59ba595f68d8..9a4d2df4b32342c19d03f03a83563f0f178ba54c 100644
+index 494843e9095c800608858ceecb6d294615bf59af..21397e1847270ac0678fe3c6d35d09843dc71de2 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -116,7 +116,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {
-       display.set_depth_per_component(Display::kHDR10BitsPerComponent);
-     }
-   }
+@@ -108,7 +108,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {
+ 
+   display.set_color_depth(Display::kDefaultBitsPerPixel);
+   display.set_depth_per_component(Display::kDefaultBitsPerComponent);
 +#ifdef MAS_BUILD
 +  // This is equivalent to the CGDisplayUsesForceToGray() API as at 2018-08-06,
 +  // but avoids usage of the private API.

patches/chromium/notification_provenance.patch

@@ -55,7 +55,7 @@ index 5253f6be778cc78571b3df0a33d364a9b1e6ef52..dc5307e6500b0bfb5da83e8d8ff8886b
  
    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-index 951dc88b44e76b6736aa0ff30d548022486f0f6a..ea7f72b7aa05c31972e4abbdc6529ab044117b0b 100644
+index 619ad99bb52d489826d1e442a7719d985f0696ec..f7c9d3cac66879ce2be06a7a27ea96bfabf3230a 100644
 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
 +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
 @@ -139,7 +139,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
@@ -108,10 +108,10 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
  
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 9fb44d0458606955e0d28ba9ef37f3a1eb7e58ab..a9edced0ef239cbb729e7b064f755536d92f57bc 100644
+index 21d2d4b66b69704fbe177942a60f93216c106869..6021b5d6f7e9c6932f0913927895f29169974fea 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2028,7 +2028,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2031,7 +2031,7 @@ void RenderProcessHostImpl::CreateNotificationService(
      mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

patches/chromium/printing.patch

@@ -382,7 +382,7 @@ index 9fbea6d0a2dbe55b1d600fbc217dee5aa8ae8cd5..de9bd267e408c02fd4da7d903523c0e6
    // content::BrowserMessageFilter:
    bool OnMessageReceived(const IPC::Message& message) override;
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index c4707f4680f1522689c77d3e8bbc57cb62787381..2909205539b2fcfc86e610cfdff0ca418b73d934 100644
+index 3695656560c54b5aa1fb08fb5e7c17d54989c597..85ffa5704d8dea809e80b1993c7c852fc545c7a6 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
 @@ -35,7 +35,7 @@ interface PrintRenderer {
@@ -395,7 +395,7 @@ index c4707f4680f1522689c77d3e8bbc57cb62787381..2909205539b2fcfc86e610cfdff0ca41
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page using the print preview document's frame/node, and then
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e9f7e7cca 100644
+index 17c865379c303aa65e134e850c4f7cffe18c410c..c50980a7d38b1110e8f3e7c177c4095ca67c9472 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -38,6 +38,7 @@
@@ -452,7 +452,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
    print_preview_context_.OnPrintPreview();
  
    base::UmaHistogramEnumeration(print_preview_context_.IsForArc()
-@@ -1564,13 +1568,13 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
+@@ -1569,13 +1573,13 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
        print_preview_context_.set_error(PREVIEW_ERROR_METAFILE_CAPTURE_FAILED);
        return false;
      }
@@ -473,7 +473,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
    }
  
    preview_params.document_cookie = print_pages_params_->params.document_cookie;
-@@ -1705,7 +1709,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1710,7 +1714,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
      auto self = weak_ptr_factory_.GetWeakPtr();
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -484,7 +484,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -1716,7 +1722,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1721,7 +1727,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -495,7 +495,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1724,7 +1732,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1729,7 +1737,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    int expected_page_count = 0;
@@ -504,7 +504,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1744,8 +1752,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1749,8 +1757,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
  
      PrintMsg_PrintPages_Params print_settings;
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -518,7 +518,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -1979,10 +1990,23 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -1984,10 +1995,23 @@ void PrintRenderFrameHelper::IPCProcessed() {
      base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
  }
  
@@ -545,7 +545,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
    // 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.
-@@ -2002,12 +2026,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
+@@ -2007,12 +2031,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
    return result;
  }
  
@@ -565,7 +565,7 @@ index 1af8977aaa94dc9cb8b6587bff84884d5f0cd20f..819c9416a30aac7f10fd788c477a0c8e
      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 0778deefa7af69bb747719ab1c05c6de6c201be5..9d1872d79b4bf88a2d8db8b24eebfdc63c2ad2a8 100644
+index 51cfabd4dbeaa63538f4483c7a1948afaa665de1..0850b96b7511c494692a24026734d7574a390974 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -222,7 +222,7 @@ class PrintRenderFrameHelper
@@ -577,7 +577,7 @@ index 0778deefa7af69bb747719ab1c05c6de6c201be5..9d1872d79b4bf88a2d8db8b24eebfdc6
    void PrintForSystemDialog() override;
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void InitiatePrintPreview(
-@@ -285,7 +285,9 @@ class PrintRenderFrameHelper
+@@ -286,7 +286,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -588,7 +588,7 @@ index 0778deefa7af69bb747719ab1c05c6de6c201be5..9d1872d79b4bf88a2d8db8b24eebfdc6
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -294,12 +296,14 @@ class PrintRenderFrameHelper
+@@ -295,12 +297,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.

patches/chromium/resource_file_conflict.patch

@@ -52,7 +52,7 @@ 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 8035baf46830c5f96a96f44783746dfa80158ff9..b2ec798a614e53431ade09ce16fc831a6f8636e5 100644
+index bbc1aa4a9816281fb09647859c3b96e1f9cd0138..9fb4d55d1c527b6e1ba1fc5727b890872ffe3c16 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -1488,7 +1488,7 @@ if (is_chrome_branded && !is_android) {

patches/chromium/revert_remove_contentrendererclient_shouldfork.patch

@@ -6,10 +6,10 @@ Subject: Revert "Remove ContentRendererClient::ShouldFork."
 This reverts commit 6b068eb8ca4a3c7350bdafa22fc0cf0636ef8b74.
 
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index d37bd7451b4a73fc7b00e5cc1dfcb823c7a142fb..0e2800f3e5b0ee1b8e88921cbf3f18258ca51e7b 100644
+index 8b4ddc020612fd477fd0a7360c8be45661592847..fb0c05ef22c6d9e7ffe50315121f3b42c9a5bc69 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -1302,6 +1302,17 @@ bool ChromeContentRendererClient::ShouldFork(WebLocalFrame* frame,
+@@ -1306,6 +1306,17 @@ bool ChromeContentRendererClient::ShouldFork(WebLocalFrame* frame,
      return true;
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -28,10 +28,10 @@ index d37bd7451b4a73fc7b00e5cc1dfcb823c7a142fb..0e2800f3e5b0ee1b8e88921cbf3f1825
  }
  
 diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
-index 1659f93d83357337cb6e2cab668811cba3f14508..ef2aafde43347a6af188cada40c106dba8a19d31 100644
+index a3f10cf198df9325be10f6bcdff33aa23553bffa..118811bfa7ab09a54cd29aca016a358e6f2f0fb3 100644
 --- a/content/renderer/render_view_browsertest.cc
 +++ b/content/renderer/render_view_browsertest.cc
-@@ -990,6 +990,73 @@ TEST_F(RenderViewImplTest, BeginNavigationForWebUI) {
+@@ -996,6 +996,73 @@ TEST_F(RenderViewImplTest, BeginNavigationForWebUI) {
        FrameHostMsg_OpenURL::ID));
  }
  

patches/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 a9edced0ef239cbb729e7b064f755536d92f57bc..cd0bc10cda20c0f874d9c315ee16860255287631 100644
+index 6021b5d6f7e9c6932f0913927895f29169974fea..c481a1b984d43e86bb72a319cc5cc75dd7efc0fa 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -413,6 +413,11 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -414,6 +414,11 @@ class RendererSandboxedProcessLauncherDelegate
    {
    }
  
@@ -37,7 +37,7 @@ index a9edced0ef239cbb729e7b064f755536d92f57bc..cd0bc10cda20c0f874d9c315ee168602
    ~RendererSandboxedProcessLauncherDelegate() override {}
  
  #if defined(OS_WIN)
-@@ -434,6 +439,9 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -435,6 +440,9 @@ class RendererSandboxedProcessLauncherDelegate
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
    service_manager::ZygoteHandle GetZygote() override {
@@ -47,7 +47,7 @@ index a9edced0ef239cbb729e7b064f755536d92f57bc..cd0bc10cda20c0f874d9c315ee168602
      const base::CommandLine& browser_command_line =
          *base::CommandLine::ForCurrentProcess();
      base::CommandLine::StringType renderer_prefix =
-@@ -448,10 +456,13 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -449,10 +457,13 @@ class RendererSandboxedProcessLauncherDelegate
      return service_manager::SandboxType::kRenderer;
    }
  
@@ -62,7 +62,7 @@ index a9edced0ef239cbb729e7b064f755536d92f57bc..cd0bc10cda20c0f874d9c315ee168602
  };
  
  const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1747,11 +1758,18 @@ bool RenderProcessHostImpl::Init() {
+@@ -1748,11 +1759,18 @@ bool RenderProcessHostImpl::Init() {
        cmd_line->PrependWrapper(renderer_prefix);
      AppendRendererCommandLine(cmd_line.get());
  

patches/chromium/web_contents.patch

@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 0e16aab4db951a3d0013ef8e1297f385de732488..db30825068d18592fed3b7e4fb920cbd03f561db 100644
+index 5253b94936f06277f90c5116326547e3ef4bbee4..1cf11bcd41df18941c638e1a6f9406398a59108a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2051,6 +2051,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2050,6 +2050,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
    std::string unique_name;
    frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
  
@@ -25,7 +25,7 @@ index 0e16aab4db951a3d0013ef8e1297f385de732488..db30825068d18592fed3b7e4fb920cbd
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2061,6 +2067,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2060,6 +2066,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }

patches/chromium/worker_context_will_destroy.patch

@@ -26,10 +26,10 @@ index d76e2c9e2667d630c60c7636f77800e40877e820..aea021b9f915c1a7e6cd394255a77d1b
    // 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 b3a891b9f9c8dbda8295d0e12b8745b1ec110b3e..fcaf16e8305e0da501d44577df7258f58f363ca9 100644
+index 58c1b0e78a66229a23cf2c930fa059a94dc70323..d549bdc3d300f8eb11e7fd9127cb06e1a0e9c720 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -880,6 +880,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -879,6 +879,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  

patches/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 748adc77aaaf26298adce580961bfabb11afa360..0add559b3bdaabb73d6365b780d06aedfd89c879 100644
+index 4379153d34fe5c7e8a276047f1a3f0b0c5442ec5..48a3513beb7e2c72246f0615084a877fc89ccf18 100644
 --- a/include/v8.h
 +++ b/include/v8.h
 @@ -5017,6 +5017,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@@ -30,7 +30,7 @@ index 748adc77aaaf26298adce580961bfabb11afa360..0add559b3bdaabb73d6365b780d06aed
       * 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 27f67b486df10f73ca62ebd55ae579fc227a1834..e46e98b9a17f2be8d0dc3ebc8e429ad76baeb569 100644
+index 8c1afc275065d578371fc7d3d23b5e3354a7e167..931b73f833fc3aebce93b9a9ebb911082a4ea2c9 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
 @@ -515,6 +515,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

patches/v8/build_gn.patch

@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 417a4f655ded5073b1070ce456c6cb71ccc26070..0912f5bbb762e791ed82bbc0a7688583e6f0c1b8 100644
+index f2c246e542752dffbac1055a064a63698d93ad4a..3e4cb6231da6cbd3c2cecf9a5494a711a168d6c6 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -296,7 +296,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 417a4f655ded5073b1070ce456c6cb71ccc26070..0912f5bbb762e791ed82bbc0a7688583
      defines += [ "BUILDING_V8_SHARED" ]
    }
  }
-@@ -3797,7 +3797,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3798,7 +3798,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 417a4f655ded5073b1070ce456c6cb71ccc26070..0912f5bbb762e791ed82bbc0a7688583
  
      deps = [
        ":v8_libbase",
-@@ -3830,6 +3830,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -3831,6 +3831,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  

patches/v8/dcheck.patch

@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index e46e98b9a17f2be8d0dc3ebc8e429ad76baeb569..280ce6c084e082e5a83bf0a698dbf3f1293ef53a 100644
+index 931b73f833fc3aebce93b9a9ebb911082a4ea2c9..580c301b1ccef03b26d5a87589b277a90efa7f05 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -8642,7 +8642,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -8656,7 +8656,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::RunMicrotasks() {
@@ -19,10 +19,10 @@ index e46e98b9a17f2be8d0dc3ebc8e429ad76baeb569..280ce6c084e082e5a83bf0a698dbf3f1
    isolate->default_microtask_queue()->RunMicrotasks(isolate);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 0d2eac06f41607c3a388bea47ab86e03c3ada502..b567fc96a9a5988ebdbdea15c89b88d9cc059cef 100644
+index 8e9b66f08b0e6639f985f13656b5f62d21a8be9b..d984467eff551f0fdc5cd2da6a93b64268ae0270 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -5386,9 +5386,9 @@ void Heap::TearDown() {
+@@ -5423,9 +5423,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);

patches/v8/do_not_export_private_v8_symbols_on_windows.patch

@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 3e8b6bbf685f596b46db48c9bc8a4417cd041263..a3a4bfc32f22f13890e696b064b06bcda6f6494c 100644
+index 37204c9cefcadffb99e0b74d07148e1a0d0ec5a3..11355d58aaa391c83d0cd9f3facc804c5fa8e56a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -296,6 +296,10 @@ config("internal_config") {

patches/v8/expose_mksnapshot.patch

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 0912f5bbb762e791ed82bbc0a7688583e6f0c1b8..3e8b6bbf685f596b46db48c9bc8a4417cd041263 100644
+index 3e4cb6231da6cbd3c2cecf9a5494a711a168d6c6..37204c9cefcadffb99e0b74d07148e1a0d0ec5a3 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -3808,7 +3808,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -3809,7 +3809,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {

shell/browser/atom_download_manager_delegate.cc

@@ -134,7 +134,8 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
   } else {
     std::move(callback).Run(path,
                             download::DownloadItem::TARGET_DISPOSITION_PROMPT,
-                            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
+                            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+                            item->GetMixedContentStatus(), path,
                             download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
 }
@@ -180,8 +181,8 @@ void AtomDownloadManagerDelegate::OnDownloadSaveDialogDone(
                    : download::DOWNLOAD_INTERRUPT_REASON_NONE;
   std::move(download_callback)
       .Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
-           download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
-           interrupt_reason);
+           download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+           item->GetMixedContentStatus(), path, interrupt_reason);
 }
 
 void AtomDownloadManagerDelegate::Shutdown() {
@@ -199,6 +200,7 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
         download->GetForcedFilePath(),
         download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+        download::DownloadItem::MixedContentStatus::UNKNOWN,
         download->GetForcedFilePath(),
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
@@ -210,7 +212,8 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
   if (!save_path.empty()) {
     std::move(*callback).Run(
         save_path, download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, save_path,
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+        download::DownloadItem::MixedContentStatus::UNKNOWN, save_path,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }