Browse Source

chore: update patches

deepak1556 10 months ago
parent
commit
c79edcf85a
32 changed files with 160 additions and 145 deletions
  1. 2 2
      patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch
  2. 5 5
      patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
  3. 3 3
      patches/chromium/blink_local_frame.patch
  4. 7 7
      patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
  5. 10 10
      patches/chromium/can_create_window.patch
  6. 1 1
      patches/chromium/chore_add_electron_deps_to_gitignores.patch
  7. 6 6
      patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
  8. 3 3
      patches/chromium/disable_hidden.patch
  9. 5 5
      patches/chromium/expose_setuseragent_on_networkcontext.patch
  10. 2 2
      patches/chromium/extend_apply_webpreferences.patch
  11. 11 11
      patches/chromium/feat_configure_launch_options_for_service_process.patch
  12. 3 3
      patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
  13. 2 2
      patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
  14. 2 2
      patches/chromium/fix_restore_original_resize_performance_on_macos.patch
  15. 9 9
      patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
  16. 2 2
      patches/chromium/frame_host_manager.patch
  17. 1 1
      patches/chromium/gritsettings_resource_ids.patch
  18. 2 2
      patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
  19. 12 12
      patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
  20. 8 8
      patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
  21. 1 1
      patches/chromium/notification_provenance.patch
  22. 1 1
      patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
  23. 2 2
      patches/chromium/printing.patch
  24. 6 6
      patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
  25. 2 3
      patches/chromium/render_widget_host_view_base.patch
  26. 3 3
      patches/chromium/resource_file_conflict.patch
  27. 2 2
      patches/chromium/scroll_bounce_flag.patch
  28. 1 1
      patches/chromium/support_mixed_sandbox_with_zygote.patch
  29. 6 6
      patches/chromium/web_contents.patch
  30. 5 5
      patches/chromium/webview_fullscreen.patch
  31. 2 2
      patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch
  32. 33 17
      patches/nan/remove_allcan_read_write.patch

+ 2 - 2
patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch

@@ -20,7 +20,7 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57
  
      case ssl_open_record_error:
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index ec0ee893e58d49890f5545d02b533d07e362309c..b1c1a77c340e7d2c9e2ef21fcf0cc01ed6e15cc0 100644
+index 278c7a9b48756b81246be6af66e0cdea0a9a2c9a..2f4ebd2348b05bf4097d27615e3e1ebabbd3dc90 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
 @@ -1340,7 +1340,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
@@ -32,7 +32,7 @@ index ec0ee893e58d49890f5545d02b533d07e362309c..b1c1a77c340e7d2c9e2ef21fcf0cc01e
        return SSL_ERROR_ZERO_RETURN;
      }
      // An EOF was observed which violates the protocol, and the underlying
-@@ -2707,13 +2707,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
+@@ -2722,13 +2722,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
    return CRYPTO_get_ex_data(&ctx->ex_data, idx);
  }
  

+ 5 - 5
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -116,10 +116,10 @@ index a1197832494afac5207b682f187929844b0ebfd7..1c2c61d09d505eef575107201302c7be
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 995ba98826ff6f081cad7a530fe2982255e3ed0b..578e6b44127f4d7f131bd568b4e5d55c2614bb56 100644
+index f65c2cee6f6a1de4df7431941a30d216058d9aa6..884862490b783a9ae7705e2cefbdff3397758153 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -2444,6 +2444,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
+@@ -2458,6 +2458,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
    TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
                 "old_state", old_state, "new_state", new_state);
  
@@ -130,7 +130,7 @@ index 995ba98826ff6f081cad7a530fe2982255e3ed0b..578e6b44127f4d7f131bd568b4e5d55c
    bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
                              !old_state->is_in_back_forward_cache;
    bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
-@@ -3958,10 +3962,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3972,10 +3976,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -155,7 +155,7 @@ index 995ba98826ff6f081cad7a530fe2982255e3ed0b..578e6b44127f4d7f131bd568b4e5d55c
    // Do not throttle if the page should be painting.
    bool is_visible =
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 075df7cc712fb625d684d16ed5e0601ad827fc9a..976ec61268527b56ffcf05e54dc499255093dec8 100644
+index e36a3b35fd3cbfc9439b15b32cf1bf432b8e1122..b8f0b7830e6d14c40d2371378556000d347e78fb 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
 @@ -450,6 +450,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -166,7 +166,7 @@ index 075df7cc712fb625d684d16ed5e0601ad827fc9a..976ec61268527b56ffcf05e54dc49925
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -931,6 +932,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -932,6 +933,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  

+ 3 - 3
patches/chromium/blink_local_frame.patch

@@ -49,10 +49,10 @@ index 55343df3901f295f6570dfbcf74d326b6d0e1c4a..3ba0f8e60848147d61958f97d3ac0a89
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index f017b58c85a2e1b285d4f3674fb6cc5237e8a358..d95b696c77b85d6d2b36f0c449e84ad023c17412 100644
+index 48225f3d975b39fea9b3a1eba2a08c8e2ee652fa..fdea0a951e47bc5c160a92231646ca9e6f8e33e1 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -730,10 +730,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -736,10 +736,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index f017b58c85a2e1b285d4f3674fb6cc5237e8a358..d95b696c77b85d6d2b36f0c449e84ad0
    if (!Client())
      return false;
  
-@@ -786,6 +782,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -792,6 +788,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  

+ 7 - 7
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index b7ce77bc5981331caf1a46c5eb4e9c3c4a79b3d5..8e95a6712bfddb2c7548f3a5489508194bc4de37 100644
+index 5670ab265ecd247cbeda5e7d7085389c8a8d1a53..0a0d5affce9f1a33ef69c05867d9ba485b17f7c4 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -192,11 +192,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index b7ce77bc5981331caf1a46c5eb4e9c3c4a79b3d5..8e95a6712bfddb2c7548f3a548950819
            "//base",
            "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 8c3671ff909e1a70b0fe74352d25aac9491c3f6e..cd182bb08f739eafbe94db2c7668717ea69c9f23 100644
+index 8de3ba20bad69a86ab16b7e0876332508ef6515b..1a85d0c2630968b4cd2c312621cbe8591c86e9d6 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4857,7 +4857,7 @@ static_library("browser") {
+@@ -4864,7 +4864,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 8c3671ff909e1a70b0fe74352d25aac9491c3f6e..cd182bb08f739eafbe94db2c7668717e
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index beeeb51c09d70c5525f52fbce26f0b85ea10539b..f39309a682d748a1ad6ea8063d5590dadf64916a 100644
+index d77d249b179c48f7fbdc25cad22be587dbadd293..20ac2a59244d179f77276f636bf2858fb4bfc76d 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7386,9 +7386,12 @@ test("unit_tests") {
+@@ -7370,9 +7370,12 @@ test("unit_tests") {
        "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
      ]
  
@@ -63,7 +63,7 @@ index beeeb51c09d70c5525f52fbce26f0b85ea10539b..f39309a682d748a1ad6ea8063d5590da
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -8391,6 +8394,10 @@ test("unit_tests") {
+@@ -8379,6 +8382,10 @@ test("unit_tests") {
        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
      ]
  
@@ -74,7 +74,7 @@ index beeeb51c09d70c5525f52fbce26f0b85ea10539b..f39309a682d748a1ad6ea8063d5590da
      sources += [
        # The importer code is not used on Android.
        "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8471,7 +8478,6 @@ test("unit_tests") {
+@@ -8459,7 +8466,6 @@ test("unit_tests") {
  
      # Non-android deps for "unit_tests" target.
      deps += [

+ 10 - 10
patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 5f92e9d85785bbea06870b877652c54db107d5f8..ccfee9748a686a450a00f8fee9f19728bb73e9d3 100644
+index a8c72f80f6914bfb5a21349de8e0b4b31e18c91c..a1fa193c9b4817892c97fb1b2fbf3167054374f1 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -8531,6 +8531,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -8546,6 +8546,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 5f92e9d85785bbea06870b877652c54db107d5f8..ccfee9748a686a450a00f8fee9f19728
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 205a1bb692091e425233bf6bd1e9910104585667..52ca5fc9774f74547f8231db8028fb9eb0b62996 100644
+index 3352d1409320718a4402c31cfb7b59eee7464b66..a7279d4ea1a7db8f50f85f935e1e06d0f0987bc5 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4714,6 +4714,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4754,6 +4754,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    auto* new_contents_impl = new_contents.get();
  
@@ -37,7 +37,7 @@ index 205a1bb692091e425233bf6bd1e9910104585667..52ca5fc9774f74547f8231db8028fb9e
    // If the new frame has a name, make sure any SiteInstances that can find
    // this named frame have proxies for it.  Must be called after
    // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
-@@ -4755,12 +4761,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4795,12 +4801,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -66,7 +66,7 @@ index 6df9186bcee6a56da11da8e365c7cf5b4375e366..0fdda1a6e0ac98a8c8619b4d4fab5977
  
  // 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 8df62dd712ad5dd0defaf627f326f3a5fc3bf4a6..d4e15a44e0da008fdee90ffc39268aae457c1054 100644
+index fe3f35005221168ba892ad392b616a363eaad949..1c0259b5c79a52c41b024a022f5a45d890042642 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -733,6 +733,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -79,10 +79,10 @@ index 8df62dd712ad5dd0defaf627f326f3a5fc3bf4a6..d4e15a44e0da008fdee90ffc39268aae
      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 8f457dd1d2afb5a1e0ba6199245d6b122ddc6003..c1ee730e69877e909661e3a84258e877f4fa37e8 100644
+index 6a7963e71a066f41202856f961de0d75d0ee0acc..e902ac85a653a826f70db4c9a10776e4e32198f5 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -187,6 +187,7 @@ class NetworkService;
+@@ -188,6 +188,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -90,7 +90,7 @@ index 8f457dd1d2afb5a1e0ba6199245d6b122ddc6003..c1ee730e69877e909661e3a84258e877
  }  // namespace network
  
  namespace sandbox {
-@@ -1244,6 +1245,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1245,6 +1246,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -210,7 +210,7 @@ index c79c07788b16c394ed413a6a739b7dcdd4697496..1b25625d84fe6b2c64de106b4e86e9ac
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 0cf716bebc828f9c4613f276e6485781dfe20ab5..8b535ad3d4d1ea5e9cddd95c97ae029117d381b3 100644
+index 451c228ec18f25eba303e5b06de6faa0c0800bc0..1041564538f1a6e65494bdc37f51b18021fa62b5 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
 @@ -2251,6 +2251,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

+ 1 - 1
patches/chromium/chore_add_electron_deps_to_gitignores.patch

@@ -18,7 +18,7 @@ index 50992a3f4502d46a1bc2713c25bec6095c541ffa..121a09d7fa00162fe64ce901cae96d8f
  /googleurl
  /gpu/gles2_conform_test
 diff --git a/third_party/.gitignore b/third_party/.gitignore
-index e40ac4ea0b646f282768c58eddd9db7f6539ccd9..767644e39c48ee0a7805ab09879b8792166d03dc 100644
+index ac9e9ba28b09e5ae53d9a72c25194821981dad65..a9d781a0dd7fdc4836399e20e2a463ca37998895 100644
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
 @@ -51,7 +51,9 @@

+ 6 - 6
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

@@ -80,10 +80,10 @@ index 28cd699814f32a7a569d63936b9544567a66d9c4..fd461fa448d983481dc4c0c7d03b1945
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 6dc8deaa47046e9ad6c81fb0ab48eb9f374cfaeb..7b60193f537faf9b88e546aa4287b95b9fb3a593 100644
+index 6ca8527a73e53fdb6515360e7cd58310c46402d5..5f0c343e5a5f2b554a672f6d69ce2a7291c93d21 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -2064,12 +2064,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -2070,12 +2070,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -141,7 +141,7 @@ index ca72b324bf7c3b81ac94b53f0ff454d2df177950..d60ef3075d126e2bbd50c8469f2bf67c
    // The profile used for the presentation.
    raw_ptr<Profile, DanglingUntriaged> otr_profile_;
 diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
-index e4c31867e264c4f9aa2a451a934eda705826a1a3..f6325a210aec33aa63257bdf3bc542d845f3708e 100644
+index 1b29ac2afdbbc10ea59649b741e17583abf10536..cef3d60636e39cab514c45a085cc3a1d6587729a 100644
 --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
 +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
 @@ -75,8 +75,7 @@ class HatsNextWebDialog::HatsWebView : public views::WebView {
@@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 1f36be39c1f345f84d3ca8666dcd7ac6dbc4ae9b..7e994945a4bd5e3db876496762ab073ac8d76155 100644
+index b21305c697648b577fda1da7d85d41ca72e56e0f..87aa67836b71b2beafc79ca534a1c9d6fca66d3c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4620,8 +4620,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4660,8 +4660,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -316,7 +316,7 @@ index f0b71aba6dfb4682ce2e5b4c834b2526dcacb75c..d4b1857ca468ff97914d91d0c31298b7
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
-index 41e911c5e383eb85b461a14b3c0543922f6f25ad..32bd05155142aec16279d5ce2e0941583ea526c8 100644
+index 4d829cd24ec34d075c62b622e5e8fa836b7ae5f4..ab282d281e24ca9635c8f7d2753089d5b19649f9 100644
 --- a/fuchsia_web/webengine/browser/frame_impl.cc
 +++ b/fuchsia_web/webengine/browser/frame_impl.cc
 @@ -574,8 +574,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(

+ 3 - 3
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 4f222d812b7627bc9dbe80996530188b8558d8ab..351e9df45b4df594f5a098624ea2c2d3ed8025f1 100644
+index 649438086fc9829103c7c6299ca613ee5a139844..276c07b2120c26584ccf923be650bcb3143d6565 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -777,6 +777,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -778,6 +778,9 @@ void RenderWidgetHostImpl::WasHidden() {
      return;
    }
  
@@ -20,7 +20,7 @@ index 4f222d812b7627bc9dbe80996530188b8558d8ab..351e9df45b4df594f5a098624ea2c2d3
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 65032bc948aa801f1620f1c21099827f839e41f2..6ed6e9c0a39207da97a2b0d7248a46b613c217cd 100644
+index d2ce4f02a65c787abd31b3cf4437111c289d7115..ca5c356442d39120126d2873979f468614e3d4a3 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -993,6 +993,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

+ 5 - 5
patches/chromium/expose_setuseragent_on_networkcontext.patch

@@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 96a54852e46ad6c179a59c76ce33ee09ff1dca8d..42c2ed15d3369d9ea9c8f0eecd758475284b4b7a 100644
+index 5bb46cf0ed165f216fa4bf2813dfe2de18b15e94..8a8a0d40970a9107a09d40ccc10ff5ccba33b095 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -1682,6 +1682,13 @@ void NetworkContext::SetNetworkConditions(
@@ -51,7 +51,7 @@ index 96a54852e46ad6c179a59c76ce33ee09ff1dca8d..42c2ed15d3369d9ea9c8f0eecd758475
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 85281c28ee6968d844dbe2c8c26779adf1967e71..3a6c48c7b08cb84e30a4815a783732511b4044fe 100644
+index 06f2d96a0158348e151d90303a83a2ab263d4e5c..1a9baf9e7fb10373ed9469e13dd8119edab5c40b 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -318,6 +318,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -63,10 +63,10 @@ index 85281c28ee6968d844dbe2c8c26779adf1967e71..3a6c48c7b08cb84e30a4815a78373251
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CT_SUPPORTED)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 6b868b5744f0250d2a566051d26d746a19a26177..3b58a45343e07a013a5d9ae759696502453c68c6 100644
+index a19f7cfaa35d9097a660ba0e3d7e402b47a8c1a4..26fbe6d1b75d1fea503b2201399a8d88ef5bb2af 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1266,6 +1266,9 @@ interface NetworkContext {
+@@ -1265,6 +1265,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,7 +77,7 @@ index 6b868b5744f0250d2a566051d26d746a19a26177..3b58a45343e07a013a5d9ae759696502
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index db21e3f02b3e0fecf4c2c494afe4d806170be3f1..d0175513938d3307662e95e20bc1f703aeaaa2cb 100644
+index f421326b04a048a655fd0ae9c098aa7e52807162..460fe57899b02538f5ba5d608aefca3a57b3411a 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -147,6 +147,7 @@ class TestNetworkContext : public mojom::NetworkContext {

+ 2 - 2
patches/chromium/extend_apply_webpreferences.patch

@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 578e6b44127f4d7f131bd568b4e5d55c2614bb56..ace1aff76fd4e9a3967c924d23693f82a6c23780 100644
+index 884862490b783a9ae7705e2cefbdff3397758153..1c3a7d0eb3d9b1fa5ae7199fc8b71870063e4393 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -168,6 +168,7 @@
@@ -23,7 +23,7 @@ index 578e6b44127f4d7f131bd568b4e5d55c2614bb56..ace1aff76fd4e9a3967c924d23693f82
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1834,6 +1835,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1837,6 +1838,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);

+ 11 - 11
patches/chromium/feat_configure_launch_options_for_service_process.patch

@@ -18,7 +18,7 @@ to STDOUT_FILENO/STD_OUTPUT_HANDLE and STDERR_FILENO/STD_ERROR_HANDLE allowing t
 parent process to read from the pipe.
 
 diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h
-index 613feee88115d32905a3f8889cdf51d71cd5b4ec..da2fefd7b6e93a6f8b6eb008ebaac976f4ce64ea 100644
+index e3bc6f02cffcdbc0954173e4033a43437e3d5c37..7a7d8931759479021c14b9e014622a742bdbbe21 100644
 --- a/content/browser/child_process_launcher.h
 +++ b/content/browser/child_process_launcher.h
 @@ -32,6 +32,7 @@
@@ -29,7 +29,7 @@ index 613feee88115d32905a3f8889cdf51d71cd5b4ec..da2fefd7b6e93a6f8b6eb008ebaac976
  #endif
  
  #if BUILDFLAG(IS_POSIX)
-@@ -165,7 +166,10 @@ struct ChildProcessLauncherFileData {
+@@ -169,7 +170,10 @@ struct ChildProcessLauncherFileData {
        delete;
    ~ChildProcessLauncherFileData();
  
@@ -41,7 +41,7 @@ index 613feee88115d32905a3f8889cdf51d71cd5b4ec..da2fefd7b6e93a6f8b6eb008ebaac976
    // Files opened by the browser and passed as corresponding file descriptors
    // in the child process. If a FilePath is provided, the file will be opened
    // and the descriptor cached for future process launches. If a ScopedFD is
-@@ -180,6 +184,15 @@ struct ChildProcessLauncherFileData {
+@@ -184,6 +188,15 @@ struct ChildProcessLauncherFileData {
    std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
        files_to_preload;
  #endif
@@ -628,10 +628,10 @@ index cb43aa14c9742f3788ae58c3e49b890cd532f327..6a738f7aade504f2ff3bb6647a0da8f8
  #if BUILDFLAG(IS_MAC)
    // Whether or not to disclaim TCC responsibility for the process, defaults to
 diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
-index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a4324438a47 100644
+index a26c541c46a02d6b2e1566ad99d7cefdfba83b4b..b76568415a5845ef0b414e4cde9f241b6b86af01 100644
 --- a/sandbox/policy/win/sandbox_win.cc
 +++ b/sandbox/policy/win/sandbox_win.cc
-@@ -688,11 +688,9 @@ base::win::ScopedHandle CreateUnsandboxedJob() {
+@@ -694,11 +694,9 @@ base::win::ScopedHandle CreateUnsandboxedJob() {
  // command line flag.
  ResultCode LaunchWithoutSandbox(
      const base::CommandLine& cmd_line,
@@ -644,7 +644,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
    // Network process runs in a job even when unsandboxed. This is to ensure it
    // does not outlive the browser, which could happen if there is a lot of I/O
    // on process shutdown, in which case TerminateProcess can fail. See
-@@ -923,7 +921,7 @@ bool SandboxWin::InitTargetServices(TargetServices* target_services) {
+@@ -929,7 +927,7 @@ bool SandboxWin::InitTargetServices(TargetServices* target_services) {
  ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
      const base::CommandLine& cmd_line,
      const std::string& process_type,
@@ -653,7 +653,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
      SandboxDelegate* delegate,
      TargetPolicy* policy) {
    const base::CommandLine& launcher_process_command_line =
-@@ -937,7 +935,7 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
+@@ -943,7 +941,7 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
    }
  
    // Add any handles to be inherited to the policy.
@@ -662,7 +662,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
      policy->AddHandleToShare(handle);
  
    if (!policy->GetConfig()->IsConfigured()) {
-@@ -952,6 +950,13 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
+@@ -958,6 +956,13 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
    // have no effect. These calls can fail with SBOX_ERROR_BAD_PARAMS.
    policy->SetStdoutHandle(GetStdHandle(STD_OUTPUT_HANDLE));
    policy->SetStderrHandle(GetStdHandle(STD_ERROR_HANDLE));
@@ -676,7 +676,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
  #endif
  
    if (!delegate->PreSpawnTarget(policy))
-@@ -964,7 +969,7 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
+@@ -970,7 +975,7 @@ ResultCode SandboxWin::GeneratePolicyForSandboxedProcess(
  ResultCode SandboxWin::StartSandboxedProcess(
      const base::CommandLine& cmd_line,
      const std::string& process_type,
@@ -685,7 +685,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
      SandboxDelegate* delegate,
      base::Process* process) {
    SandboxLaunchTimer timer;
-@@ -972,7 +977,7 @@ ResultCode SandboxWin::StartSandboxedProcess(
+@@ -978,7 +983,7 @@ ResultCode SandboxWin::StartSandboxedProcess(
    // Avoid making a policy if we won't use it.
    if (IsUnsandboxedProcess(delegate->GetSandboxType(), cmd_line,
                             *base::CommandLine::ForCurrentProcess())) {
@@ -694,7 +694,7 @@ index 459e6b31d7c10e4725e2b9140a2c66472261d725..ddff9f18dfb593fdd9b8cee7a3910a43
                                  process);
    }
  
-@@ -980,7 +985,7 @@ ResultCode SandboxWin::StartSandboxedProcess(
+@@ -986,7 +991,7 @@ ResultCode SandboxWin::StartSandboxedProcess(
    timer.OnPolicyCreated();
  
    ResultCode result = GeneratePolicyForSandboxedProcess(

+ 3 - 3
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch

@@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
 Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
 
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index 1004937569f989d3376f20102225db2ca543132c..46bece51282df087425ad6a987d051f2fc25b657 100644
+index 85e2191f120ab0dd0757760e2a6adec404de2957..f75c60da9abff4e2a66b8578140f8694840960be 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -10527,6 +10527,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
+@@ -10505,6 +10505,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
      }
    }
  
@@ -40,7 +40,7 @@ index 1004937569f989d3376f20102225db2ca543132c..46bece51282df087425ad6a987d051f2
    // origin of |common_params.url| and/or |common_params.initiator_origin|.
    url::Origin resolved_origin = url::Origin::Resolve(
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
-index 3ec0883615fad82a3debccabc9112b0b6905eb5a..5d86e417e2a80db466ccfb9adc0f20bd36edc051 100644
+index a6e1f40eb4a3dfe96fae204b5e5a8f0125d4e2ad..2a8ca029fb040e3efb8899a0778dd7e2987608b2 100644
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
 @@ -2231,6 +2231,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {

+ 2 - 2
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch

@@ -87,10 +87,10 @@ index 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed
    // The view with active text input state, i.e., a focused <input> element.
    // It will be nullptr if no such view exists. Note that the active view
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 239092d0231980c9febf342c78880aeed4be47ed..95569538ea569c12c2f6a3d8f28e4bfa705173c7 100644
+index f0d4891adfb86c1ff99fe52fb8b3911076f01e2a..b9ef74e8392fb8d0c117ed9d69a2dd82bcfb9a1a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -9086,7 +9086,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
+@@ -9126,7 +9126,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
                          "WebContentsImpl::OnFocusedElementChangedInFrame",
                          "render_frame_host", frame);
    RenderWidgetHostViewBase* root_view =

+ 2 - 2
patches/chromium/fix_restore_original_resize_performance_on_macos.patch

@@ -11,10 +11,10 @@ This patch should be upstreamed as a conditional revert of the logic in desktop
 vs mobile runtimes.  i.e. restore the old logic only on desktop platforms
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index efcac7b1aedb20f0cea94c61597f361d9a165633..731d762bf57e7164ca60155d6629d2a2e94461d1 100644
+index 26829888b5f32ca0a44c790241e197039efcd0aa..2195f23e9cb12681c0972b332e6e5056ef85ff9f 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2051,9 +2051,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
+@@ -2052,9 +2052,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
  void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
    // The resize message (which may not happen immediately) will carry with it
    // the screen info as well as the new size (if the screen has changed scale

+ 9 - 9
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch

@@ -64,10 +64,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..7a985067b1371604644d48159f2f5aa7
  
  #endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index d95b696c77b85d6d2b36f0c449e84ad023c17412..d581625a81b7286eb1be8896c194217420964e90 100644
+index fdea0a951e47bc5c160a92231646ca9e6f8e33e1..2f265658d914836e58f8a206fc398a84222a5a49 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -3076,6 +3076,7 @@ void LocalFrame::RequestExecuteScript(
+@@ -3091,6 +3091,7 @@ void LocalFrame::RequestExecuteScript(
      mojom::blink::EvaluationTiming evaluation_timing,
      mojom::blink::LoadEventBlockingOption blocking_option,
      WebScriptExecutionCallback callback,
@@ -75,7 +75,7 @@ index d95b696c77b85d6d2b36f0c449e84ad023c17412..d581625a81b7286eb1be8896c1942174
      BackForwardCacheAware back_forward_cache_aware,
      mojom::blink::WantResultOption want_result_option,
      mojom::blink::PromiseResultOption promise_behavior) {
-@@ -3109,7 +3110,7 @@ void LocalFrame::RequestExecuteScript(
+@@ -3124,7 +3125,7 @@ void LocalFrame::RequestExecuteScript(
    PausableScriptExecutor::CreateAndRun(
        script_state, std::move(script_sources), execute_script_policy,
        user_gesture, evaluation_timing, blocking_option, want_result_option,
@@ -85,10 +85,10 @@ index d95b696c77b85d6d2b36f0c449e84ad023c17412..d581625a81b7286eb1be8896c1942174
  
  void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
 diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
-index 0da6278d80f365d840c9ac7c551f878c6adbeeea..4c082c719fa9641b6637ae9532ea5fc2bb075d7a 100644
+index e87408dbb6e627118a00d0b803e400b4c9e56b44..867d94c1572e07ff6af8eab1e3fece9ad77fbaee 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.h
 +++ b/third_party/blink/renderer/core/frame/local_frame.h
-@@ -825,6 +825,7 @@ class CORE_EXPORT LocalFrame final
+@@ -830,6 +830,7 @@ class CORE_EXPORT LocalFrame final
                              mojom::blink::EvaluationTiming,
                              mojom::blink::LoadEventBlockingOption,
                              WebScriptExecutionCallback,
@@ -97,7 +97,7 @@ index 0da6278d80f365d840c9ac7c551f878c6adbeeea..4c082c719fa9641b6637ae9532ea5fc2
                              mojom::blink::WantResultOption,
                              mojom::blink::PromiseResultOption);
 diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
-index b1c9a584be0baaa868fbcd1b6ead72e73808154c..b9afebbbb383f2eb5fc08efc1b5d89f89ce004e3 100644
+index 58fc9827290bf20eb89b649dbc7d6d9da5f94245..a29b055e18c4d7bde94da07f31341a551f4916fd 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
 @@ -954,6 +954,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
@@ -204,7 +204,7 @@ index fa65331f40b90d812b71a489fd560e9359152d2b..390714d631dc88ef92d59ef9618a5706
    const mojom::blink::UserActivationOption user_activation_option_;
    const mojom::blink::LoadEventBlockingOption blocking_option_;
 diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
-index 9d4a82292e58df96589c4fb9efb5469042a3faf8..0d76dc78f8e8d8832fc4801664f2f7aa326b05e9 100644
+index 3dbdae2305f24878a26b21f010a1c031736db11c..c30a457bcc040f9995657f45049c496e20e6ebe7 100644
 --- a/third_party/blink/renderer/core/frame/web_frame_test.cc
 +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
 @@ -288,6 +288,7 @@ void ExecuteScriptsInMainWorld(
@@ -216,10 +216,10 @@ index 9d4a82292e58df96589c4fb9efb5469042a3faf8..0d76dc78f8e8d8832fc4801664f2f7aa
        mojom::blink::WantResultOption::kWantResult, wait_for_promise);
  }
 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 73111871ec1859dc10d6f0bf8160fed3dd7ace18..2962322eefba6c317c6a19bfce36d6a76a028abe 100644
+index ae33f98cbe2410f853e705cf316517d802d2b834..7d934d8c2e505fc2729dd37ddb43ce38ce31c3e8 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
-@@ -1083,14 +1083,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
+@@ -1084,14 +1084,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
      mojom::blink::EvaluationTiming evaluation_timing,
      mojom::blink::LoadEventBlockingOption blocking_option,
      WebScriptExecutionCallback callback,

+ 2 - 2
patches/chromium/frame_host_manager.patch

@@ -20,10 +20,10 @@ index b14d207d8fffc1178fe24a1112476eef63845acc..0b72301968d79d277b8ccaa5d7fcb847
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index c1ee730e69877e909661e3a84258e877f4fa37e8..751be3d56d72f1eb6fbb96bf6f884075738b3aed 100644
+index e902ac85a653a826f70db4c9a10776e4e32198f5..0375fd2bb366be02174fe507eae871d60c792f0c 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -312,6 +312,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -313,6 +313,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  

+ 1 - 1
patches/chromium/gritsettings_resource_ids.patch

@@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 2450f2cece03374b6ee91b5e7b4e4f112ecefbb3..0c60e0a593c0deee04f97834da07bda1e8bffd68 100644
+index 226dd625553352f4c0544792850bbcec09282a6f..59ce2116c42570e7d56fbe229960a34be4a58832 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -1338,6 +1338,11 @@

+ 2 - 2
patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch

@@ -8,10 +8,10 @@ require a largeish patch to get working, so just redirect it to our
 implementation instead.
 
 diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
-index de3bf9edfd25e6defd3245f283bae1fed9151b06..5931d446f1fecd1f6c3fd05224d43ada1306fdd6 100644
+index d672fda980688514e1f31c3f287bc92532cfdad8..ec081f28cd9233e0cbfbe83b7211240482614891 100644
 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
-@@ -11,8 +11,8 @@
+@@ -12,8 +12,8 @@
  #include "base/numerics/safe_conversions.h"
  #include "base/unguessable_token.h"
  #include "base/uuid.h"

+ 12 - 12
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch

@@ -459,7 +459,7 @@ index 05dbd641ea4af9276be7f89627e4075153e667a9..a50cc9cd1502d7aaebdb7029fc5792fe
    return kAttributes;
  }
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index ceea1f99cc55f5184e95eab8d978655ab683c321..959dae2a087ee92b238d726e26fd105fc22b0304 100644
+index b1a4ec4e8ccd2d6875c66153660e7d76b4e887b5..924e2242330430b6a9c1d27fb7ab5cf34b2daf9d 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -54,6 +54,7 @@ source_set("browser") {
@@ -608,10 +608,10 @@ index 2ad8852bf38dbfbdc600a5a21b354385338eb81e..1e17e24f269fb6fc758a90fa11e33fce
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
-index 45490079b1f7b651532bc4758204aa872a52f7dc..409e530483da72db1f127ed8b1ab14bd3fb4b55b 100644
+index 6edbef34112ccae4e7e3e4f96ffacdb430234497..72d3fa4996b2d141bdf2ae703bc1d28fe7dfa7ea 100644
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
-@@ -236,6 +236,7 @@ source_set("common") {
+@@ -220,6 +220,7 @@ source_set("common") {
      "//content:content_implementation",
      "//build/config:precompiled_headers",
    ]
@@ -620,10 +620,10 @@ index 45490079b1f7b651532bc4758204aa872a52f7dc..409e530483da72db1f127ed8b1ab14bd
    public_deps = [
      ":mojo_bindings",
 diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
-index b19f9ebb80563a6798983f372967824ab96dc590..54d0c71648027a6242be9768c79b0ac590e4a02d 100644
+index c60a3f782dbadd7acaa658d844a73c96b899dd36..78bfe250a8241e8942f5f6b812ddc36d4511f78d 100644
 --- a/content/renderer/BUILD.gn
 +++ b/content/renderer/BUILD.gn
-@@ -226,6 +226,7 @@ target(link_target_type, "renderer") {
+@@ -230,6 +230,7 @@ target(link_target_type, "renderer") {
    }
  
    configs += [ "//content:content_implementation" ]
@@ -700,10 +700,10 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019
  
  }  // namespace content
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
-index c69b0bb7c1c0a62a124b86bea02523d469f5e388..5314f8557fef9a66183ecde560a4ee6fcc1bc4d8 100644
+index 0f5d5c69bcab6feb8b2f3de86e3324d95f2efc31..c59fbd5d57055991d2c9a1d16633d1b8546634aa 100644
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -504,6 +504,7 @@ static_library("test_support") {
+@@ -502,6 +502,7 @@ static_library("test_support") {
    configs += [
      "//build/config:precompiled_headers",
      "//v8:external_startup_data",
@@ -711,7 +711,7 @@ index c69b0bb7c1c0a62a124b86bea02523d469f5e388..5314f8557fef9a66183ecde560a4ee6f
    ]
  
    public_deps = [
-@@ -1103,6 +1104,7 @@ static_library("browsertest_support") {
+@@ -1102,6 +1103,7 @@ static_library("browsertest_support") {
    }
  
    configs += [ "//v8:external_startup_data" ]
@@ -719,7 +719,7 @@ index c69b0bb7c1c0a62a124b86bea02523d469f5e388..5314f8557fef9a66183ecde560a4ee6f
  }
  
  mojom("content_test_mojo_bindings") {
-@@ -1717,6 +1719,7 @@ test("content_browsertests") {
+@@ -1716,6 +1718,7 @@ test("content_browsertests") {
    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
  
    configs += [ "//build/config:precompiled_headers" ]
@@ -727,7 +727,7 @@ index c69b0bb7c1c0a62a124b86bea02523d469f5e388..5314f8557fef9a66183ecde560a4ee6f
  
    public_deps = [
      ":test_interfaces",
-@@ -2968,6 +2971,7 @@ test("content_unittests") {
+@@ -2965,6 +2968,7 @@ test("content_unittests") {
    }
  
    configs += [ "//build/config:precompiled_headers" ]
@@ -1260,7 +1260,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..dc30306f2c5d20503399fc3a8860773a
  
  }  // namespace sandbox
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index 2a9d420eabfee17a39604e525af6f0fa95fafc04..0883cfc964881922f3f5b04426923544c49a2273 100644
+index 6ee0ec12c17501514937f9126338bd402546d28b..9801bfbc7b6e0fe85809b343500cad352f01ff21 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
 @@ -330,6 +330,7 @@ component("core") {
@@ -1554,7 +1554,7 @@ index cd08cb3b7c95a8fd418524652bb345945291112a..13c6cc142262781450d1075fe85f86ad
    // Query the display's refresh rate.
    {
 diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
-index 060744da5ed7e6d814a94b2b8576ff672c980c85..0cdd00f78c1518e29bc935e4b35399091882de71 100644
+index 5255116a8e8f897607e5c5df2875dbaf275ec919..0a28b2832470f3c9d45f70499be29c2b29cb1b25 100644
 --- a/ui/gfx/BUILD.gn
 +++ b/ui/gfx/BUILD.gn
 @@ -204,6 +204,7 @@ component("gfx") {

+ 8 - 8
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch

@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 42d451bfe43e1cf936cb9f06fcf3903913ee275b..96a54852e46ad6c179a59c76ce33ee09ff1dca8d 100644
+index 62333599b3f30db1f34f05cf27144da0623dcbcd..5bb46cf0ed165f216fa4bf2813dfe2de18b15e94 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -156,6 +156,11 @@
@@ -136,7 +136,7 @@ index 42d451bfe43e1cf936cb9f06fcf3903913ee275b..96a54852e46ad6c179a59c76ce33ee09
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2428,6 +2533,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2427,6 +2532,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = std::move(cert_verifier_with_trust_anchors);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -147,7 +147,7 @@ index 42d451bfe43e1cf936cb9f06fcf3903913ee275b..96a54852e46ad6c179a59c76ce33ee09
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 7c53177c1f2bced06d4282775325233149fd8986..85281c28ee6968d844dbe2c8c26779adf1967e71 100644
+index fd9e08cc896533c372e8cbf6be890beda2815d20..06f2d96a0158348e151d90303a83a2ab263d4e5c 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -113,6 +113,7 @@ class URLMatcher;
@@ -167,7 +167,7 @@ index 7c53177c1f2bced06d4282775325233149fd8986..85281c28ee6968d844dbe2c8c26779ad
    void ResetURLLoaderFactories() override;
    void GetViaObliviousHttp(
        mojom::ObliviousHttpRequestPtr request,
-@@ -902,6 +905,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -905,6 +908,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -177,10 +177,10 @@ index 7c53177c1f2bced06d4282775325233149fd8986..85281c28ee6968d844dbe2c8c26779ad
    std::unique_ptr<HostResolver> internal_host_resolver_;
    std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 5597a97f13cc0738b14f050a768605e929d07dcd..6b868b5744f0250d2a566051d26d746a19a26177 100644
+index 41d8b7b417dd1fb25a631c9caa9140c42b8af633..a19f7cfaa35d9097a660ba0e3d7e402b47a8c1a4 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -298,6 +298,16 @@ struct SocketBrokerRemotes {
+@@ -297,6 +297,16 @@ struct SocketBrokerRemotes {
    pending_remote<SocketBroker> server;
  };
  
@@ -197,7 +197,7 @@ index 5597a97f13cc0738b14f050a768605e929d07dcd..6b868b5744f0250d2a566051d26d746a
  
  // Parameters for constructing a network context.
  struct NetworkContextParams {
-@@ -970,6 +980,9 @@ interface NetworkContext {
+@@ -969,6 +979,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
@@ -208,7 +208,7 @@ index 5597a97f13cc0738b14f050a768605e929d07dcd..6b868b5744f0250d2a566051d26d746a
    CreateURLLoaderFactory(pending_receiver<URLLoaderFactory> url_loader_factory,
                           URLLoaderFactoryParams params);
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index 9d7e3c953449aec6ba3009c256389480a555b24e..db21e3f02b3e0fecf4c2c494afe4d806170be3f1 100644
+index 69e536043162ae5bc9abd50e0439d1fb3d3851ff..f421326b04a048a655fd0ae9c098aa7e52807162 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -62,6 +62,8 @@ class TestNetworkContext : public mojom::NetworkContext {

+ 1 - 1
patches/chromium/notification_provenance.patch

@@ -133,7 +133,7 @@ index 38c8cf36fdf9366121c7ada96c167a4c9664952e..03b37fb62655a355e104870a088e4222
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 32454297cb12b381a031d5a2945c304d3dc6b8d7..f10b138225d28e5253b4dd5cf06249f552aaa604 100644
+index d9554e07228d5eba7525f39c2caec26fd2fa7092..63a6c487ef9557510e673a4a4a60436789358bdc 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -2096,7 +2096,7 @@ void RenderProcessHostImpl::CreateNotificationService(

+ 1 - 1
patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch

@@ -10,7 +10,7 @@ an about:blank check to this area.
 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index cbd93364ad4c43dfa7fd0b3506ba65059dfc9fc5..995eae8fffc5edeccbfc4e608aeb5d18e0d41b5b 100644
+index 0072c01ef574d20ec0d96ca119ad20f7f7c2c425..447a6f92f75c58735615a2bec62958b397042a7f 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -785,8 +785,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(

+ 2 - 2
patches/chromium/printing.patch

@@ -861,10 +861,10 @@ index 14de029740ffbebe06d309651c1a2c007d9fb96b..e9bf9c5bef2a9235260e7d6c8d26d415
    ScriptingThrottler scripting_throttler_;
  
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 959dae2a087ee92b238d726e26fd105fc22b0304..00a49f37b816ff6048f5196bf893b7f40857c383 100644
+index 924e2242330430b6a9c1d27fb7ab5cf34b2daf9d..699fac43cba61d94eb53ab5ce7171447e4433ec2 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2963,8 +2963,9 @@ source_set("browser") {
+@@ -2965,8 +2965,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  

+ 6 - 6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch

@@ -30,10 +30,10 @@ index e8738cf3a033f69a2e8eaf06f1a9f61bf83e9066..b3777cb41cb5c6b007122ae808732765
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 351e9df45b4df594f5a098624ea2c2d3ed8025f1..efcac7b1aedb20f0cea94c61597f361d9a165633 100644
+index 276c07b2120c26584ccf923be650bcb3143d6565..26829888b5f32ca0a44c790241e197039efcd0aa 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -1985,6 +1985,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
+@@ -1986,6 +1986,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_) {
      view_->UpdateCursor(cursor);
    }
@@ -44,10 +44,10 @@ index 351e9df45b4df594f5a098624ea2c2d3ed8025f1..efcac7b1aedb20f0cea94c61597f361d
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 52ca5fc9774f74547f8231db8028fb9eb0b62996..1f36be39c1f345f84d3ca8666dcd7ac6dbc4ae9b 100644
+index a7279d4ea1a7db8f50f85f935e1e06d0f0987bc5..b21305c697648b577fda1da7d85d41ca72e56e0f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5405,6 +5405,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -5445,6 +5445,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -60,10 +60,10 @@ index 52ca5fc9774f74547f8231db8028fb9eb0b62996..1f36be39c1f345f84d3ca8666dcd7ac6
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index eefe5b401638e17f38f6b841086f12046b45b2bf..35f727d27bdeaca03c811f018fa28b9c9796375b 100644
+index 557f90197b6e268e12afd26d44c5bf3a7b5eb0de..9a12bdd6994ddb2e346a7c961d07b3281b68fb8b 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1082,6 +1082,7 @@ class CONTENT_EXPORT WebContentsImpl
+@@ -1090,6 +1090,7 @@ class CONTENT_EXPORT WebContentsImpl
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;

+ 2 - 3
patches/chromium/render_widget_host_view_base.patch

@@ -24,17 +24,16 @@ index d2a2794dd355993084b2b4d37c0cb4b597a8f55b..5a8d990236984d4c7b7ef54accd94dce
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index c5d3a88ea14af5f8281d541d12a02802f1cdc351..41d708ec314d5f5916a6c51eed364384e3e25bc7 100644
+index 6f0e8113423dddfe7fc95d0a02af50fa15ec8f8e..70abc988e842a9b3b256e041d0274c72341c3431 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
-@@ -26,10 +26,12 @@
+@@ -27,9 +27,11 @@
  #include "components/viz/common/surfaces/scoped_surface_id_allocator.h"
  #include "components/viz/common/surfaces/surface_id.h"
  #include "content/browser/renderer_host/display_feature.h"
 -#include "content/common/content_export.h"
 +#include "content/browser/renderer_host/visible_time_request_trigger.h"
 +#include "content/browser/web_contents/web_contents_view.h"
- #include "content/common/input/input_router_impl.h"
  #include "content/common/input/render_widget_host_view_input.h"
  #include "content/public/browser/render_frame_metadata_provider.h"
 +#include "content/public/browser/render_widget_host.h"

+ 3 - 3
patches/chromium/resource_file_conflict.patch

@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 010692aac03eb0cc77c86a0a7d70560a308e653b..b7ce77bc5981331caf1a46c5eb4e9c3c4a79b3d5 100644
+index 88ca4b3aab2c79a6783bf1738161236b104d96b9..5670ab265ecd247cbeda5e7d7085389c8a8d1a53 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1574,7 +1574,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1557,7 +1557,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 010692aac03eb0cc77c86a0a7d70560a308e653b..b7ce77bc5981331caf1a46c5eb4e9c3c
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1613,6 +1613,12 @@ if (!is_android) {
+@@ -1596,6 +1596,12 @@ if (!is_android) {
    }
  }
  

+ 2 - 2
patches/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 c977c0ed1815106673b34156fb085889a956ae6c..38c8e8a8b00bec57c7f333ea5ddac452ebd280d0 100644
+index 144b00419efeb83b0c2d24d79f466c31e11335bf..b077d20d6a410dcd8a00287878a6c70268fb2215 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1258,7 +1258,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1273,7 +1273,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {

+ 1 - 1
patches/chromium/support_mixed_sandbox_with_zygote.patch

@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index f10b138225d28e5253b4dd5cf06249f552aaa604..2144c0178038e1f581b857ead1f82585110885d2 100644
+index 63a6c487ef9557510e673a4a4a60436789358bdc..a7310f168d82cfb23590d2355921427f723bcf61 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1741,9 +1741,15 @@ bool RenderProcessHostImpl::Init() {

+ 6 - 6
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 7e994945a4bd5e3db876496762ab073ac8d76155..fa60a21219cfbd35790222e355c734c5309b937c 100644
+index 87aa67836b71b2beafc79ca534a1c9d6fca66d3c..c3029038f3ba1c137fabd88b4a81189a1354c518 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3610,6 +3610,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3650,6 +3650,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        params.main_frame_name, GetOpener(), primary_main_frame_policy,
        base::UnguessableToken::Create());
  
@@ -26,7 +26,7 @@ index 7e994945a4bd5e3db876496762ab073ac8d76155..fa60a21219cfbd35790222e355c734c5
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3620,6 +3627,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3660,6 +3667,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,10 +35,10 @@ index 7e994945a4bd5e3db876496762ab073ac8d76155..fa60a21219cfbd35790222e355c734c5
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 1ee36913ac37c260bd3f718f1220598c1983c127..1788de12b06c290228f3e8a188a882611539d3cc 100644
+index 0a3aa41c18f2141a0fb45ec6e424ef49f7ee607e..c20612d82ec0f922823b3f46244ad92138592c15 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -105,10 +105,13 @@ class BrowserContext;
+@@ -106,10 +106,13 @@ class BrowserContext;
  class BrowserPluginGuestDelegate;
  class RenderFrameHost;
  class RenderViewHost;
@@ -52,7 +52,7 @@ index 1ee36913ac37c260bd3f718f1220598c1983c127..1788de12b06c290228f3e8a188a88261
  class WebUI;
  struct DropData;
  struct MHTMLGenerationParams;
-@@ -255,6 +258,10 @@ class WebContents : public PageNavigator,
+@@ -256,6 +259,10 @@ class WebContents : public PageNavigator,
      network::mojom::WebSandboxFlags starting_sandbox_flags =
          network::mojom::WebSandboxFlags::kNone;
  

+ 5 - 5
patches/chromium/webview_fullscreen.patch

@@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index ccfee9748a686a450a00f8fee9f19728bb73e9d3..cbd93364ad4c43dfa7fd0b3506ba65059dfc9fc5 100644
+index a1fa193c9b4817892c97fb1b2fbf3167054374f1..0072c01ef574d20ec0d96ca119ad20f7f7c2c425 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7690,6 +7690,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -7705,6 +7705,17 @@ void RenderFrameHostImpl::EnterFullscreen(
      }
    }
  
@@ -37,10 +37,10 @@ index ccfee9748a686a450a00f8fee9f19728bb73e9d3..cbd93364ad4c43dfa7fd0b3506ba6505
    if (had_fullscreen_token && !GetView()->HasFocus())
      GetView()->Focus();
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index fa60a21219cfbd35790222e355c734c5309b937c..239092d0231980c9febf342c78880aeed4be47ed 100644
+index c3029038f3ba1c137fabd88b4a81189a1354c518..f0d4891adfb86c1ff99fe52fb8b3911076f01e2a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3865,21 +3865,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
+@@ -3905,21 +3905,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
      const input::NativeWebKeyboardEvent& event) {
    OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
                          "WebContentsImpl::PreHandleKeyboardEvent");
@@ -78,7 +78,7 @@ index fa60a21219cfbd35790222e355c734c5309b937c..239092d0231980c9febf342c78880aee
  }
  
  bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
-@@ -4036,7 +4040,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -4076,7 +4080,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame));
    DCHECK(requesting_frame->IsActive());

+ 2 - 2
patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch

@@ -10,10 +10,10 @@ to handle this without patching, but this is fairly clean for now and no longer
 patching legacy devtools code.
 
 diff --git a/front_end/entrypoints/main/MainImpl.ts b/front_end/entrypoints/main/MainImpl.ts
-index 3fab27f094ca75608f4b05b179abd7f53608a013..244a78f1e92f7e749c8d42979184f53a629c487a 100644
+index 3bb2ddebb80190f08c4ef10ffed1fd91b6d45655..ef797a964d62fbc45a6c7ee8f07f49642a074491 100644
 --- a/front_end/entrypoints/main/MainImpl.ts
 +++ b/front_end/entrypoints/main/MainImpl.ts
-@@ -723,6 +723,8 @@ export class MainImpl {
+@@ -729,6 +729,8 @@ export class MainImpl {
  globalThis.Main = globalThis.Main || {};
  // @ts-ignore Exported for Tests.js
  globalThis.Main.Main = MainImpl;

+ 33 - 17
patches/nan/remove_allcan_read_write.patch

@@ -140,13 +140,19 @@ index e6ad45737e2ac18da3fa936b1de618e7389933bc..025f5b66774c2f5fe0ccb98c91fc714d
 -  t.equal(settergetter.prop2, 'setting a new value')
  })
 diff --git a/test/js/methodswithdata-test.js b/test/js/methodswithdata-test.js
-index 9f4fc5246f1ca3d8faadc9a72d49e14a6a190e32..1dfdc5213db77cd324683d1e569e0bf48c53619e 100644
+index 9f4fc5246f1ca3d8faadc9a72d49e14a6a190e32..bd84842a835af059fbe5a0d6d25dd01bb8909b6f 100644
 --- a/test/js/methodswithdata-test.js
 +++ b/test/js/methodswithdata-test.js
-@@ -10,29 +10,28 @@ const test     = require('tap').test
-     , testRoot = require('path').resolve(__dirname, '..')
-     , bindings = require('bindings')({ module_root: testRoot, bindings: 'methodswithdata' })
- 
+@@ -4,35 +4,34 @@
+  * Copyright (c) 2019 NAN contributors
+  *
+  * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
+- ********************************************************************/
+-
+-const test     = require('tap').test
+-    , testRoot = require('path').resolve(__dirname, '..')
+-    , bindings = require('bindings')({ module_root: testRoot, bindings: 'methodswithdata' })
+-
 -test('SetMethod with data', function (t) {
 -    t.plan(1);
 -    t.ok(bindings.testWithData());
@@ -160,6 +166,24 @@ index 9f4fc5246f1ca3d8faadc9a72d49e14a6a190e32..1dfdc5213db77cd324683d1e569e0bf4
 -    settergetter.prop2 = 'setting a value'
 -    t.equal(settergetter.prop2, 'setting a value')
 -    t.equal(settergetter.log(),
+-      'New()\n' +
+-      'Prop1:GETTER(this is property 1)\n' +
+-      'Prop2:GETTER()\n' +
+-      'Prop2:SETTER(setting a value)\n' +
+-      'Prop2:GETTER(setting a value)\n'
+-    )
+-    var derived = Object.create(settergetter)
+-    t.equal(derived.prop1, 'this is property 1')
+-    derived.prop2 = 'setting a new value'
+-    t.equal(derived.prop2, 'setting a new value')
+-    t.equal(settergetter.prop2, 'setting a new value')
+-  })
++ ********************************************************************/
++
++const test     = require('tap').test
++    , testRoot = require('path').resolve(__dirname, '..')
++    , bindings = require('bindings')({ module_root: testRoot, bindings: 'methodswithdata' })
++
 +test('SetMethod with data', function (t) {
 +    t.plan(1);
 +    t.ok(bindings.testWithData());
@@ -173,18 +197,10 @@ index 9f4fc5246f1ca3d8faadc9a72d49e14a6a190e32..1dfdc5213db77cd324683d1e569e0bf4
 +    settergetter.prop2 = 'setting a value'
 +    t.equal(settergetter.prop2, 'setting a value')
 +    t.equal(settergetter.log(),
-       'New()\n' +
-       'Prop1:GETTER(this is property 1)\n' +
-       'Prop2:GETTER()\n' +
-       'Prop2:SETTER(setting a value)\n' +
--      'Prop2:GETTER(setting a value)\n'
--    )
--    var derived = Object.create(settergetter)
--    t.equal(derived.prop1, 'this is property 1')
--    derived.prop2 = 'setting a new value'
--    t.equal(derived.prop2, 'setting a new value')
--    t.equal(settergetter.prop2, 'setting a new value')
--  })
++      'New()\n' +
++      'Prop1:GETTER(this is property 1)\n' +
++      'Prop2:GETTER()\n' +
++      'Prop2:SETTER(setting a value)\n' +
 +      'Prop2:GETTER(setting a value)\n'
 +    )
 +    var derived = Object.create(settergetter)