Browse Source

chore: export patches

alice 4 weeks ago
parent
commit
c063cc947e
23 changed files with 62 additions and 62 deletions
  1. 3 3
      patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
  2. 2 2
      patches/chromium/adjust_accessibility_ui_for_electron.patch
  3. 6 6
      patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
  4. 5 5
      patches/chromium/can_create_window.patch
  5. 1 1
      patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch
  6. 2 2
      patches/chromium/chore_partial_revert_of.patch
  7. 2 2
      patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
  8. 1 1
      patches/chromium/enable_reset_aspect_ratio.patch
  9. 7 7
      patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
  10. 1 1
      patches/chromium/fix_activate_background_material_on_windows.patch
  11. 1 1
      patches/chromium/fix_aspect_ratio_with_max_size.patch
  12. 2 2
      patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
  13. 1 1
      patches/chromium/fix_remove_caption-removing_style_call.patch
  14. 1 1
      patches/chromium/gritsettings_resource_ids.patch
  15. 1 1
      patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
  16. 6 6
      patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
  17. 1 1
      patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
  18. 2 2
      patches/chromium/printing.patch
  19. 4 4
      patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
  20. 2 2
      patches/chromium/refactor_unfilter_unresponsive_events.patch
  21. 4 4
      patches/chromium/render_widget_host_view_mac.patch
  22. 3 3
      patches/chromium/web_contents.patch
  23. 4 4
      patches/chromium/webview_fullscreen.patch

+ 3 - 3
patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch

@@ -8,10 +8,10 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
 
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index 8c4378a7555d6a71888142700c8d296649308b94..f6d64c51cfcdc5e416ac14e30e08af793b1c722f 100644
+index 8064a2c27d747d4862503526496a65987df7dc35..c92596713c6d3884be3f63bf78d9117b7ad3ec90 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
-@@ -231,6 +231,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
+@@ -237,6 +237,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
    }
  }
  
@@ -29,7 +29,7 @@ index 8c4378a7555d6a71888142700c8d296649308b94..f6d64c51cfcdc5e416ac14e30e08af79
    objects_.clear();
    raw_objects_.clear();
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-index d8fd611e88c22f2c1319da769dcd14cc218f9c90..f17304e1e9fd202dc4e1b7724031dc4c333a4baf 100644
+index 939a99b2a086d5373f82fe96da73dabe02f6f9d8..fccc200b1b11076c8fcffde071a53598ffba9a12 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.h
 +++ b/ui/base/clipboard/scoped_clipboard_writer.h
 @@ -87,6 +87,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {

+ 2 - 2
patches/chromium/adjust_accessibility_ui_for_electron.patch

@@ -10,7 +10,7 @@ usage of BrowserList and Browser as we subclass related methods and use our
 WindowList.
 
 diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
-index 628fe5557f963c52cbe0c5b24c6e06aaa81f9677..868f5eb60c35dfaa0a4e33e7f175743848e0cc2e 100644
+index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb491ec14b2 100644
 --- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
 @@ -48,6 +48,7 @@
@@ -38,7 +38,7 @@ index 628fe5557f963c52cbe0c5b24c6e06aaa81f9677..868f5eb60c35dfaa0a4e33e7f1757438
 +  PrefService* pref = static_cast<electron::ElectronBrowserContext*>(current_context)->prefs();
    ui::AXMode mode =
        content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
-   bool is_a11y_allowed = content::BrowserAccessibilityState::GetInstance()
+   bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
 @@ -221,7 +222,7 @@ void HandleAccessibilityRequestCallback(
    data.Set(kPDFPrinting, pdf_printing ? kOn : kOff);
  

+ 6 - 6
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,10 +33,10 @@ index b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 9c43df9df76524dbf03f056135bc02a8c26926d2..7be9e636e733c48ce97477a149e6d454875965e8 100644
+index 173eae7b47c7fcdcb87d8b6f2b42cf0e4089c8e4..84b23a9d869c7128d56b5aa988b5f96763c16b56 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4581,7 +4581,7 @@ static_library("browser") {
+@@ -4585,7 +4585,7 @@ static_library("browser") {
            [ "//chrome/browser/ui/webui/signin:profile_impl" ]
      }
  
@@ -46,10 +46,10 @@ index 9c43df9df76524dbf03f056135bc02a8c26926d2..7be9e636e733c48ce97477a149e6d454
        # than here in :chrome_dll.
        deps += [ "//chrome:packed_resources_integrity_header" ]
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 284c4d5d64b07674aadc5bc226bfaa6d918c2273..38013655097eb6fcef60bd720537c0c17fd381ea 100644
+index 0ab87d4b8a3c6137c3ddce993da26a94dd95a54d..3e8f96794868ffa6ea6e49111868c445c0263989 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7076,9 +7076,12 @@ test("unit_tests") {
+@@ -7077,9 +7077,12 @@ test("unit_tests") {
        "//chrome/notification_helper",
      ]
  
@@ -63,7 +63,7 @@ index 284c4d5d64b07674aadc5bc226bfaa6d918c2273..38013655097eb6fcef60bd720537c0c1
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -8043,6 +8046,10 @@ test("unit_tests") {
+@@ -8044,6 +8047,10 @@ test("unit_tests") {
        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
      ]
  
@@ -74,7 +74,7 @@ index 284c4d5d64b07674aadc5bc226bfaa6d918c2273..38013655097eb6fcef60bd720537c0c1
      sources += [
        # The importer code is not used on Android.
        "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8098,7 +8105,6 @@ test("unit_tests") {
+@@ -8099,7 +8106,6 @@ test("unit_tests") {
      # Non-android deps for "unit_tests" target.
      deps += [
        "../browser/screen_ai:screen_ai_install_state",

+ 5 - 5
patches/chromium/can_create_window.patch

@@ -9,7 +9,7 @@ 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 05c85402eee94f5c15ce6cee2b237db8e457318f..2621a17f130313a7dade56419a45e9a366ac2518 100644
+index bcc57e292c1721d64756bdb84d1c790e3476b4e4..de2d6700eec969833253dd9a6c384a1e080efd9f 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -9637,6 +9637,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -21,10 +21,10 @@ index 05c85402eee94f5c15ce6cee2b237db8e457318f..2621a17f130313a7dade56419a45e9a3
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b8796edcb333b0c78871b4c443ff2fc415136c7b..ea3752a8bb071cc9f042c85ec009a19a9bbba518 100644
+index b10545bea8fae9673b0dfe2e01807a983d125042..bd987178a8fa5755c727cefb90f6b6a89f984bcd 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5075,6 +5075,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5076,6 +5076,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
                                                 opener);
  
@@ -37,7 +37,7 @@ index b8796edcb333b0c78871b4c443ff2fc415136c7b..ea3752a8bb071cc9f042c85ec009a19a
    // 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
-@@ -5116,12 +5122,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5117,12 +5123,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -210,7 +210,7 @@ index 82e9d3dfb5f7da76d89fe15ae61d379fa46e177d..fd035512099a54dff6cc951a2226c23a
  
  }  // 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 6fe961fdc8961b491d609f75a773e061739c0157..c0bb58a585d3ef6da27118b00ccb1b58964ab80e 100644
+index f4c18365f0f8ad9659bbae208f3557c7a5a075be..93923c7f6c7b773cb1089781254fb7173e988e33 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
 @@ -2272,6 +2272,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

+ 1 - 1
patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch

@@ -61,7 +61,7 @@ index 2ee5e4b4673f4f18880dddecc48118c89823fd3f..37109b8d3d439073b5c9e2ea3597c36f
    // Overridden from WidgetObserver.
    void OnWidgetThemeChanged(Widget* widget) override;
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 13ce4ee75ed3d19ca95aecc4e745a2f4fb7aa21a..93b315205d89c44c8ca4868f921d488f98245cd3 100644
+index b74134a2e0d9e3dc8ef89531b75e75fc54198c16..5daa1661843e8bbc229ce4f5d7aacca05879ec83 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -3160,15 +3160,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,

+ 2 - 2
patches/chromium/chore_partial_revert_of.patch

@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
 by changing something in Electron.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b038168517d20dfa5160e7660025943c3824d5b7..405d8041fadff1d3de58d1d20999af8d8fb15e88 100644
+index eb406a6e586d6b7bd730fe3893221de941aa6885..079d2e001b58302458e66a231465e358bb06b477 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4994,7 +4994,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4995,7 +4995,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
            : IsGuest();
    // While some guest types do not have a guest SiteInstance, the ones that
    // don't all override WebContents creation above.

+ 2 - 2
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

@@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
    content::WebContents* AddNewContents(
        content::WebContents* source,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 247cdaf86a1baf478a9c28ba57fbe46346b41d01..563cf7b39d5732e7d48117f49171b744bcf1b7f2 100644
+index a7e8f334baa7e8b80c07ad232e149c034c756a8b..fcc2ba4da50d06a2b1cbae4fb003cd6858052c11 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4957,8 +4957,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4958,8 +4958,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    // TODO(crbug.com/40202416): Support a way for MPArch guests to support this.
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,

+ 1 - 1
patches/chromium/enable_reset_aspect_ratio.patch

@@ -19,7 +19,7 @@ index d57a16302b609e7a849382f7bd1f527245d42b44..e800c02a54d13c4fbee3c884b438f23b
                                     excluded_margin);
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index cb1cdd6bc96a72e5381234181c9a7ab5a8594351..54b7b33af3f9e395dd9d2fa81a7e06f5f10134f2 100644
+index 28cbf12786c05f06ccd3015ee47ad7b4ac63d497..4fb1163fb953535c84cce706815bc2035c384ff2 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -1007,8 +1007,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,

+ 7 - 7
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch

@@ -17,7 +17,7 @@ headers, moving forward we should find a way in upstream to provide
 access to these headers for loader clients created on the browser process.
 
 diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
-index b60fd23a39eb423450b57275526ac4ba36058225..deafb4cd5a55853eb11a1371ca8331ee5f6050b2 100644
+index 7d97d0fd5481bead1f655f2f933a3ae89a729834..9b4c41209190086353b9a87833c07aabb47470bd 100644
 --- a/services/network/public/cpp/resource_request.cc
 +++ b/services/network/public/cpp/resource_request.cc
 @@ -178,6 +178,7 @@ ResourceRequest::TrustedParams& ResourceRequest::TrustedParams::operator=(
@@ -37,7 +37,7 @@ index b60fd23a39eb423450b57275526ac4ba36058225..deafb4cd5a55853eb11a1371ca8331ee
           allow_cookies_from_browser == other.allow_cookies_from_browser &&
           include_request_cookies_with_response ==
 diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
-index b87bb47d4d51f734ee3dc1e38158726795fcd19e..dd862ff8c43ecbc08467bf2b49ed5044d92ad3f3 100644
+index 538e2a52da142a442342383d223ea0d90b75be8f..19f0defab1d1ba3369423842e4eabbceee781091 100644
 --- a/services/network/public/cpp/resource_request.h
 +++ b/services/network/public/cpp/resource_request.h
 @@ -77,6 +77,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
@@ -49,7 +49,7 @@ index b87bb47d4d51f734ee3dc1e38158726795fcd19e..dd862ff8c43ecbc08467bf2b49ed5044
      mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
      mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
 diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
-index ae26e1cff7235ac77d4610f936cf83b01a9b429d..d45189ba3280cd6802240fc5cee25388f77bdb39 100644
+index 2021e4c8f05008dd57e67c14fc7e66bf49bd6e3e..2a5ed7fc54f9efd773ec6dded1b66bb9c9f26580 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.cc
 +++ b/services/network/public/cpp/url_request_mojom_traits.cc
 @@ -49,6 +49,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
@@ -61,7 +61,7 @@ index ae26e1cff7235ac77d4610f936cf83b01a9b429d..d45189ba3280cd6802240fc5cee25388
        mojo::PendingRemote<network::mojom::CookieAccessObserver>>();
    out->trust_token_observer = data.TakeTrustTokenObserver<
 diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
-index fc85f9def245d854d210b14f8190119fbd38404b..1392090ef9a1c8c0ef1a958ebeae75f24a11a6ea 100644
+index 30a38e3f82360417b682c516263f62181825c621..db8a479f483a041a6944465deb6f799a2a9bd93a 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.h
 +++ b/services/network/public/cpp/url_request_mojom_traits.h
 @@ -71,6 +71,10 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@@ -76,7 +76,7 @@ index fc85f9def245d854d210b14f8190119fbd38404b..1392090ef9a1c8c0ef1a958ebeae75f2
    cookie_observer(
        const network::ResourceRequest::TrustedParams& trusted_params) {
 diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
-index 3802bd880c7daddf3e9f4107d54a19744f039412..b88323f538dce6f839f19e45499ca12a6cf31fe0 100644
+index 78fa9126457ee380b12e39e3bf35ea4c2ccaa36c..4f39fa5d3bd665e3343882d11f1ab5747c80610e 100644
 --- a/services/network/public/mojom/url_request.mojom
 +++ b/services/network/public/mojom/url_request.mojom
 @@ -74,6 +74,9 @@ struct TrustedUrlRequestParams {
@@ -112,7 +112,7 @@ index 1e5b36d0a46d9c66b7a56a6668663dd8196bd172..3431f4c3959264b64ac0f35654719ab0
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 4408ef4ed23cd03ba1c57519272cedcff972e3a0..7feefe748e2dcbb81151e93e3434a8fcaf9b2ece 100644
+index 683380222b27618397eed667ec9d03fc6178ad6f..67b395898bdd019278b85d19f4d165daee8887b2 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -670,6 +670,9 @@ URLLoader::URLLoader(
@@ -155,7 +155,7 @@ index 4408ef4ed23cd03ba1c57519272cedcff972e3a0..7feefe748e2dcbb81151e93e3434a8fc
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index c2b3041f19728ba10fb839a4db2d32b60a094400..8e215232d43d0506b3ea20fb1ef20660d47f6894 100644
+index 083bceb8e280a2aabf7f6075708f610fd1976e91..4034ef95297c04b558b5589059bbb305b438b13a 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
 @@ -760,6 +760,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader

+ 1 - 1
patches/chromium/fix_activate_background_material_on_windows.patch

@@ -14,7 +14,7 @@ This patch likely can't be upstreamed as-is, as Chromium doesn't have
 this use case in mind currently.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index fe09f441f37ead85cc26dc2c0d5f28811c840f50..ef8dc330970df02bb73cf4b875969debd23b4f1d 100644
+index b157f8d7435c44e6b9dce7120504ed4f1ab7a673..37cce58624ee456d08c73ffe54da0d02a3395528 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -951,13 +951,13 @@ void HWNDMessageHandler::FrameTypeChanged() {

+ 1 - 1
patches/chromium/fix_aspect_ratio_with_max_size.patch

@@ -11,7 +11,7 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 54b7b33af3f9e395dd9d2fa81a7e06f5f10134f2..13ce4ee75ed3d19ca95aecc4e745a2f4fb7aa21a 100644
+index 4fb1163fb953535c84cce706815bc2035c384ff2..b74134a2e0d9e3dc8ef89531b75e75fc54198c16 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -3763,15 +3763,30 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,

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

@@ -87,10 +87,10 @@ index 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac4
    // 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 7b00e172488364277ce83d11ff9cb4dde37915eb..b038168517d20dfa5160e7660025943c3824d5b7 100644
+index dfea101147bae4de6c9164436f4d3184828b8be1..eb406a6e586d6b7bd730fe3893221de941aa6885 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -9812,7 +9812,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
+@@ -9821,7 +9821,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
                          "WebContentsImpl::OnFocusedElementChangedInFrame",
                          "render_frame_host", frame);
    RenderWidgetHostViewBase* root_view =

+ 1 - 1
patches/chromium/fix_remove_caption-removing_style_call.patch

@@ -18,7 +18,7 @@ or resizing, but Electron does not seem to run into that issue
 for opaque frameless windows even with that block commented out.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 93b315205d89c44c8ca4868f921d488f98245cd3..fe09f441f37ead85cc26dc2c0d5f28811c840f50 100644
+index 5daa1661843e8bbc229ce4f5d7aacca05879ec83..b157f8d7435c44e6b9dce7120504ed4f1ab7a673 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -1799,7 +1799,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {

+ 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 1a075c35012950f103f25d884e85a4f1c1df2cb0..d3b0bb01d1dac47d81716fc8ddbdfc0ecadf683e 100644
+index 885922f2a684c3ffa1119aeec08b41746f9a5d80..c1f4ad6b9495c9799264a57d9e497740210525b0 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -1484,6 +1484,11 @@

+ 1 - 1
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch

@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 071e222474c1f9c4d8876b4bb15f2d337b45fada..5c52ce2d31a24d5cae985c478cd066f15b566dc2 100755
+index 9cf06fbc79ffdc6cd44cd163e1924bc63c9099f6..944d5622c74e7df32b6ab26807442d80b27cc2bb 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -304,6 +304,8 @@ def GetDefaultHostOs():

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

@@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
 system priority.
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 521cb942f526a8cb0873f9ae3d72053caf14faa9..3dd33e4077e97ce92b0778e5673f9b208e484130 100644
+index 72bed5c3bbc9fba3f18ba2e30d36712319dade51..bc340d5e530382368e71352fc1a2cb699b76cda1 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
 @@ -1035,6 +1035,7 @@ component("base") {
@@ -545,7 +545,7 @@ index dbf334caa3a6d10017b69ad76802e389a011436b..da828823e8195cc9e497866363c9af93
  
    void ForwardKeyboardEvent(const input::NativeWebKeyboardEvent& key_event,
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 52540cf2b036eb78afca28b5e3bed142a82614db..a1a0da04b09cfc6edcea09c9150a958e0ef434bb 100644
+index 4017ee032569466f5311e5c9612c82c086eab935..f2499bc084312a09b2324567d270fc1b899e7617 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -35,6 +35,7 @@
@@ -556,7 +556,7 @@ index 52540cf2b036eb78afca28b5e3bed142a82614db..a1a0da04b09cfc6edcea09c9150a958e
  #include "skia/ext/skia_utils_mac.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/mojom/input/input_handler.mojom.h"
-@@ -2143,15 +2144,21 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -2136,15 +2137,21 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -579,7 +579,7 @@ index 52540cf2b036eb78afca28b5e3bed142a82614db..a1a0da04b09cfc6edcea09c9150a958e
    return kAttributes;
  }
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 5d96364e36f9a4cf63b9e15c0b27c36faf58b8a8..36934435fcd381a21c54ee5527437419735cd376 100644
+index e6de287742244dd50796b6d6a1954fd8ec4705b8..3ecb18c3b975d1cf00b482d2eab30aca11646073 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -339,6 +339,7 @@ source_set("browser") {
@@ -840,10 +840,10 @@ index 8779cf7cbbe2a583fda51867eaebc627f00bd4cd..98da1587fdc8cc8358a69db2b51d3982
  
    # TODO(crbug.com/40139469): Blink test plugin must be migrated from PPAPI.
 diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
-index d27d7140cc55a35e6ffb65028265bcb2ae5932d1..1ea92b29c730aba1c667de83bb98ca85f2046470 100644
+index 16407ea4758addb6f6b56dc044d58cde0922897a..98cf8359b412a61b48aa87b607740bbeda4ca159 100644
 --- a/device/bluetooth/BUILD.gn
 +++ b/device/bluetooth/BUILD.gn
-@@ -253,6 +253,7 @@ component("bluetooth") {
+@@ -257,6 +257,7 @@ component("bluetooth") {
        "IOKit.framework",
        "Foundation.framework",
      ]

+ 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 a3bbccf46c0c1d743f9e5a7c758e7430edaa6a19..8c2fdee07e9c640d3d9954f142a168347237d959 100644
+index 7e74582787cfd806e40efce6d9382b2dd7760f24..bc19c9b1f2a1db3d406cb0f26903c665256aee09 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -807,8 +807,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(

+ 2 - 2
patches/chromium/printing.patch

@@ -881,10 +881,10 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b
    ScriptingThrottler scripting_throttler_;
  
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 36934435fcd381a21c54ee5527437419735cd376..fb3c9e53231064c3b94b75a2751fad4d618c0b5a 100644
+index 3ecb18c3b975d1cf00b482d2eab30aca11646073..abce33fa5a332a924f91d74b7f604ae9465ce00c 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -3130,8 +3130,9 @@ source_set("browser") {
+@@ -3132,8 +3132,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  

+ 4 - 4
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch

@@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about `
 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779
 
 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h
-index 8ad5a5042355ce918ab13784fbc0d633b6f0efa9..7f7b86abf3e18501025a854000f0d9adc9ec9abc 100644
+index a54a0dedf8ef1cfffa4e80a4707debed0e83d277..e66e71fdbabb40a5307b12cd8965e773e76c04fd 100644
 --- a/content/browser/renderer_host/render_widget_host_delegate.h
 +++ b/content/browser/renderer_host/render_widget_host_delegate.h
 @@ -28,6 +28,7 @@
@@ -44,10 +44,10 @@ index 20fcda4eb20459b69247003c51c2a3ed37c7b1e8..9bcab4e1e8a0fa429488555f4f7bd1c5
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index ea3752a8bb071cc9f042c85ec009a19a9bbba518..247cdaf86a1baf478a9c28ba57fbe46346b41d01 100644
+index bd987178a8fa5755c727cefb90f6b6a89f984bcd..a7e8f334baa7e8b80c07ad232e149c034c756a8b 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5827,6 +5827,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -5828,6 +5828,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -60,7 +60,7 @@ index ea3752a8bb071cc9f042c85ec009a19a9bbba518..247cdaf86a1baf478a9c28ba57fbe463
      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 fba621e63bb665e650bf3e7b27ee997ab602e97d..ea3a206103b8b422bc4d6ea3c8f1a65faccfa708 100644
+index a35dc028fbcf202a7ba1aa7213f8c815e9a31e3f..fe3b8cf40ea7c26aade59c7224416594509f6308 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -1178,6 +1178,7 @@ class CONTENT_EXPORT WebContentsImpl

+ 2 - 2
patches/chromium/refactor_unfilter_unresponsive_events.patch

@@ -15,10 +15,10 @@ This CL removes these filters so the unresponsive event can still be
 accessed from our JS event. The filtering is moved into Electron's code.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 405d8041fadff1d3de58d1d20999af8d8fb15e88..45fd81c2162458ab1c2c55988898eeb6752ed75c 100644
+index 079d2e001b58302458e66a231465e358bb06b477..0da3c301dcaa7cb3b221f99e61dd63f6f48050f7 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -9949,25 +9949,13 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -9958,25 +9958,13 @@ void WebContentsImpl::RendererUnresponsive(
      base::RepeatingClosure hang_monitor_restarter) {
    OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive",
                          "render_widget_host", render_widget_host);

+ 4 - 4
patches/chromium/render_widget_host_view_mac.patch

@@ -8,7 +8,7 @@ respond to the first mouse click in their window, which is desirable for some
 kinds of utility windows. Similarly for `disableAutoHideCursor`.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index d711db9b57c3e272406ab0e3b1c4b06db05caea6..52540cf2b036eb78afca28b5e3bed142a82614db 100644
+index 22ee05153569d0db7cbc7ab520944e84b9475c8e..4017ee032569466f5311e5c9612c82c086eab935 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -170,6 +170,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -27,7 +27,7 @@ index d711db9b57c3e272406ab0e3b1c4b06db05caea6..52540cf2b036eb78afca28b5e3bed142
  // RenderWidgetHostViewCocoa ---------------------------------------------------
  
  // Private methods:
-@@ -781,6 +790,9 @@ - (AcceptMouseEventsOption)acceptsMouseEventsOption {
+@@ -774,6 +783,9 @@ - (AcceptMouseEventsOption)acceptsMouseEventsOption {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -37,7 +37,7 @@ index d711db9b57c3e272406ab0e3b1c4b06db05caea6..52540cf2b036eb78afca28b5e3bed142
    // Enable "click-through" if mouse clicks are accepted in inactive windows
    return [self acceptsMouseEventsOption] > kAcceptMouseEventsInActiveWindow;
  }
-@@ -926,6 +938,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -919,6 +931,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -48,7 +48,7 @@ index d711db9b57c3e272406ab0e3b1c4b06db05caea6..52540cf2b036eb78afca28b5e3bed142
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -1260,6 +1276,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -1253,6 +1269,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSEventTypeKeyDown &&
                                !(modifierFlags & NSEventModifierFlagCommand);
  

+ 3 - 3
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 563cf7b39d5732e7d48117f49171b744bcf1b7f2..5717f139ce1efd8997423b3f8b9c3927d252aae9 100644
+index fcc2ba4da50d06a2b1cbae4fb003cd6858052c11..6d3a7e370da27d273f7fa1d7df93bf6328769c59 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3896,6 +3896,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3897,6 +3897,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 563cf7b39d5732e7d48117f49171b744bcf1b7f2..5717f139ce1efd8997423b3f8b9c3927
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3906,6 +3913,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3907,6 +3914,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }

+ 4 - 4
patches/chromium/webview_fullscreen.patch

@@ -15,7 +15,7 @@ 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 2621a17f130313a7dade56419a45e9a366ac2518..a3bbccf46c0c1d743f9e5a7c758e7430edaa6a19 100644
+index de2d6700eec969833253dd9a6c384a1e080efd9f..7e74582787cfd806e40efce6d9382b2dd7760f24 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -8747,6 +8747,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -37,10 +37,10 @@ index 2621a17f130313a7dade56419a45e9a366ac2518..a3bbccf46c0c1d743f9e5a7c758e7430
    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 5717f139ce1efd8997423b3f8b9c3927d252aae9..7b00e172488364277ce83d11ff9cb4dde37915eb 100644
+index 6d3a7e370da27d273f7fa1d7df93bf6328769c59..dfea101147bae4de6c9164436f4d3184828b8be1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4171,21 +4171,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
+@@ -4172,21 +4172,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
      const input::NativeWebKeyboardEvent& event) {
    OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
                          "WebContentsImpl::PreHandleKeyboardEvent");
@@ -78,7 +78,7 @@ index 5717f139ce1efd8997423b3f8b9c3927d252aae9..7b00e172488364277ce83d11ff9cb4dd
  }
  
  bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
-@@ -4344,7 +4348,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -4345,7 +4349,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame));
    DCHECK(requesting_frame->IsActive());