Browse Source

chore!: bump chromium to 136.0.7054.0 (main) (#45923)

* chore: bump chromium in DEPS to 136.0.7054.0

* chore: update allow_in-process_windows_to_have_different_web_prefs.patch

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

patch applied manually due to context shear

* chore: e patches all

* refactor!: Session.clearStorageData(syncable)

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

Remove syncable type from opts.quota in Session.clearStorageData(opts)
because it that category has been removed upstream.

BREAKING CHANGE: Removed ses.clearDataStorage({ quota: 'syncable' })

* docs: deprecate Session.clearDataStorage({ quota })

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <[email protected]>
electron-roller[bot] 1 month ago
parent
commit
20414f66ca
27 changed files with 73 additions and 58 deletions
  1. 1 1
      DEPS
  2. 1 1
      docs/api/session.md
  3. 13 0
      docs/breaking-changes.md
  4. 2 2
      patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
  5. 4 4
      patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
  6. 16 12
      patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
  7. 3 3
      patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
  8. 3 3
      patches/chromium/can_create_window.patch
  9. 1 1
      patches/chromium/chore_partial_revert_of.patch
  10. 5 5
      patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
  11. 2 2
      patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
  12. 1 1
      patches/chromium/disable_hidden.patch
  13. 2 2
      patches/chromium/extend_apply_webpreferences.patch
  14. 1 1
      patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
  15. 3 3
      patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
  16. 2 2
      patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch
  17. 1 1
      patches/chromium/load_v8_snapshot_in_browser_process.patch
  18. 1 1
      patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
  19. 1 1
      patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
  20. 1 1
      patches/chromium/printing.patch
  21. 1 1
      patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
  22. 1 1
      patches/chromium/refactor_unfilter_unresponsive_events.patch
  23. 1 1
      patches/chromium/web_contents.patch
  24. 3 3
      patches/chromium/webview_fullscreen.patch
  25. 2 2
      patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch
  26. 0 2
      shell/browser/api/electron_api_session.cc
  27. 1 1
      spec/ts-smoke/electron/main.ts

+ 1 - 1
DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '136.0.7053.1',
+    '136.0.7054.0',
   'node_version':
     'v22.14.0',
   'nan_version':

+ 1 - 1
docs/api/session.md

@@ -651,7 +651,7 @@ Clears the session’s HTTP cache.
     `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
     specified, clear all storage types.
   * `quotas` string[] (optional) - The types of quotas to clear, can be
-    `temporary`, `syncable`. If not specified, clear all quotas.
+    `temporary`. If not specified, clear all quotas.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
 

+ 13 - 0
docs/breaking-changes.md

@@ -19,6 +19,19 @@ This document uses the following convention to categorize breaking changes:
 These properties have been removed from the PrinterInfo Object
 because they have been removed from upstream Chromium.
 
+### Removed: `quota` type `syncable` in `Session.clearStorageData(options)`
+
+When calling `Session.clearStorageData(options)`, the `options.quota` type
+`syncable` is no longer supported because it has been
+[removed](https://chromium-review.googlesource.com/c/chromium/src/+/6309405)
+from upstream Chromium.
+
+### Deprecated: `quota` property in `Session.clearStorageData(options)`
+
+When calling `Session.clearStorageData(options)`, the `options.quota`
+property is deprecated. Since the `syncable` type was removed, there
+is only type left -- `'temporary'` -- so specifying it is unnecessary.
+
 ### Deprecated: Extension methods and events on `session`
 
 `session.loadExtension`, `session.removeExtension`, `session.getExtension`,

+ 2 - 2
patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 0ccc9aaaeb1430c2556156ba5b4aac0d1cf234c5..c4142d87ba7f4d0c9cbe8e872ae12b14fac5dcc6 100644
+index 0d8bb93bf146c3058a30693673f0c23fdea90ae8..55f76337a445345c06531ce05e603db30daf759f 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -268,6 +268,10 @@ int GpuMain(MainFunctionParams parameters) {
@@ -24,7 +24,7 @@ index 0ccc9aaaeb1430c2556156ba5b4aac0d1cf234c5..c4142d87ba7f4d0c9cbe8e872ae12b14
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -377,7 +381,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -378,7 +382,6 @@ int GpuMain(MainFunctionParams parameters) {
  #endif
    const bool dead_on_arrival = !init_success;
  

+ 4 - 4
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -51,7 +51,7 @@ index 5fb8a3dc69dc5fc5bfa08e01d8f03707a23c9274..41774b60b8cb7e0a22cedc597dc07ad1
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 3cd53be3dbb0f63b632f0d7bcccfdc1b2e02ccdf..fec1cdc083d1cb365188a7635a6c062b275d1f64 100644
+index 92085aca6bd0c95a73b98e4173c0128d596b77f4..9503beefcbcfe7d99674582ece10a7e551fae96d 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -579,8 +579,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
@@ -116,10 +116,10 @@ index b1689844282d6917b9750fbc6a875848ddf84b70..f1cc159b7c3448a33a6d9e213f8fbd3b
    // 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 f1984723fb048116056b1632a153295d4e2674a5..d2fbb6060bcce9cb3bcc3829923e2f0e7aa26a75 100644
+index 5aa63d4663e9880d62a86ea721996ee2311706df..31b7ed755550f73fce87c0edbc01d9d37eeeed25 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -2466,6 +2466,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
+@@ -2467,6 +2467,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
    TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
                 "old_state", old_state, "new_state", new_state);
  
@@ -130,7 +130,7 @@ index f1984723fb048116056b1632a153295d4e2674a5..d2fbb6060bcce9cb3bcc3829923e2f0e
    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 &&
-@@ -3992,10 +3996,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3993,10 +3997,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  

+ 16 - 12
patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch

@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index f17c7ae24086ab0112bd1245291f6f512a74e223..a1a23d263e4842996c0f8dde4dca8d8b35802fda 100644
+index 2494aeb1cd363c07e1b662743b1453da646fe17d..927dce4724263b45ff27b046ef024ae2a04706a9 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -147,6 +147,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
    out->stylus_handwriting_enabled = data.stylus_handwriting_enabled();
@@ -32,7 +32,7 @@ index f17c7ae24086ab0112bd1245291f6f512a74e223..a1a23d263e4842996c0f8dde4dca8d8b
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d6d962747 100644
+index b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd715fdf82d4 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -9,6 +9,7 @@
@@ -43,7 +43,7 @@ index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d
  #include "build/build_config.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -442,6 +443,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -447,6 +448,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    // when feature DynamicSafeAreaInsets is enabled.
    bool dynamic_safe_area_insets_enabled = false;
  
@@ -65,18 +65,18 @@ index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d
    // chrome, except for the cases where it would require lots of extra work for
    // the embedder to use the same default value.
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 68f936bc7103accc4521da0a12e5e0fad05cc86c..24f209d5694cdf7128a8fb58af4957f0905058a0 100644
+index d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b220554b0c4 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_WEB_PREFERENCES_WEB_PREFERENCES_MOJOM_TRAITS_H_
+@@ -8,6 +8,7 @@
+ #include <optional>
  
  #include "build/build_config.h"
 +#include "mojo/public/cpp/base/file_path_mojom_traits.h"
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -434,6 +435,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -437,6 +438,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.stylus_handwriting_enabled;
    }
  
@@ -130,18 +130,22 @@ index 68f936bc7103accc4521da0a12e5e0fad05cc86c..24f209d5694cdf7128a8fb58af4957f0
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index f3f00b8430d131627191e0e689ab54256600e852..c88a348b9b991081609d5085890a0c2538555569 100644
+index 6678fc10d72e6c49ba729d5f44626f9a29934a3b..57f8c71bd0e3b1e09510184888636004a949c192 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
+@@ -8,9 +8,11 @@ import "third_party/blink/public/mojom/css/preferred_color_scheme.mojom";
+ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
  import "third_party/blink/public/mojom/v8_cache_options.mojom";
  import "url/mojom/url.mojom";
- import "mojo/public/mojom/base/string16.mojom";
 +import "mojo/public/mojom/base/file_path.mojom";
+ import "mojo/public/mojom/base/string16.mojom";
+ import "skia/public/mojom/skcolor.mojom";
  
++
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -217,6 +218,19 @@ struct WebPreferences {
+   kPointerFirstType                         = kPointerNone,
+@@ -218,6 +220,19 @@ struct WebPreferences {
    // If true, stylus handwriting recognition to text input will be available in
    // editable input fields which are non-password type.
    bool stylus_handwriting_enabled;

+ 3 - 3
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 ef86d31aa544c5d0d941156597dfb7efa573f887..7be2498c10a32677f536e6bb9034f4f1d28dfc98 100644
+index 389f11154cef421cd1217276c0c45c3bf29c4df0..ab7dc7768d4fa51494e802ecbe93911cd7193498 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4568,7 +4568,7 @@ static_library("browser") {
+@@ -4566,7 +4566,7 @@ static_library("browser") {
            [ "//chrome/browser/ui/webui/signin:profile_impl" ]
      }
  
@@ -46,7 +46,7 @@ index ef86d31aa544c5d0d941156597dfb7efa573f887..7be2498c10a32677f536e6bb9034f4f1
        # than here in :chrome_dll.
        deps += [ "//chrome:packed_resources_integrity_header" ]
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index c2004fbee3696136432d488feda2fb4b3e88a7a0..7e90017f7a590506fa014c1998da95b6423491ac 100644
+index 465ed84c60e25d57de7f3da6d70947cf0e183830..6c96b4b7f5796652539725320dc60edfd8de4ac9 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -7023,9 +7023,12 @@ test("unit_tests") {

+ 3 - 3
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 244456c2bd0e387ee0a498469eb7f0d66bbf2f60..2bff13ef0d15b45010a4e8baf3ac984fb5af397c 100644
+index 3eb788921d8acaafca69dd48435c4cc0b2147c4b..ee3ea03f0c60066330bc5c9f02e4c2beeafd136b 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -9617,6 +9617,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -9627,6 +9627,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,7 +21,7 @@ index 244456c2bd0e387ee0a498469eb7f0d66bbf2f60..2bff13ef0d15b45010a4e8baf3ac984f
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index bde84b6ee8f7b02a0cc74541e84b26f0e5fdee9d..0cfe3659fd5b7abab99caeed2bed6c5f209ec310 100644
+index 3d9cc010d0e80e9551cf1d07e535df7d1fd21a87..d204a45939c7318697c5eb0d6efe7bc7fe94b4d1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -5061,6 +5061,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(

+ 1 - 1
patches/chromium/chore_partial_revert_of.patch

@@ -14,7 +14,7 @@ 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 13eee4ac49c364b1714015f22aab517e18e70592..4eca2f7360dd15572521cdb2015f442b300b4c2e 100644
+index 6540f14c2c94f78282b298d84e65f4680844eb78..f4bebb35fe53e4fd68bd8519a0bfab8414b64bda 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -4980,7 +4980,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

+ 5 - 5
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

@@ -80,10 +80,10 @@ index 4fd8dff1089cd6afa6a66dc185734d7671657281..0a1f4268ea771a3d5d4a2668928c6e5d
        content::WebContents* source,
        const content::OpenURLParams& params,
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 16efc690ba53a771abfcc73d1e55e7db72866607..c734ff098a3885d9e1c6f9109301916ed6165491 100644
+index c841bd4636b447ad7400c831923f36890799a8f7..37dffc9e3dd5e577c83fce75f10a556ce924cfe3 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -2222,12 +2222,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -2249,12 +2249,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -99,10 +99,10 @@ index 16efc690ba53a771abfcc73d1e55e7db72866607..c734ff098a3885d9e1c6f9109301916e
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index a1ad664c266849eb8b4b0cdab460b6cb663ead1b..d9b42f9e7437cfc69caedfcd19cf4671b6337d26 100644
+index c34df3902e663d962553a9fd1731ad2c603393ca..897045bef1c68e5638b9b570d066066764fcae8a 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -980,8 +980,7 @@ class Browser : public TabStripModelObserver,
+@@ -981,8 +981,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -218,7 +218,7 @@ 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 e069c6e05803ecdca4b2ee39311b92c6eed8c3f8..c8584558087a55b5b098f729d208bfc859a8c5d2 100644
+index 2fb39006ca697d3b16507e3000bff2768b334092..6992093d069f0d9a50eab29cdd36bffba586eca9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -4943,8 +4943,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

+ 2 - 2
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch

@@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
 to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 1a75f6e8d733c049a3ef4978e3fb529dc31c944e..9fc6c67e42effeab24e202cfb76b21d9467952c0 100644
+index 054f38d683280638c7ac618d2ff8f7aef1a0def0..6e9d8d9a043cf8b67e26f70b3a904abcfc3c1a61 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -271,8 +271,13 @@ void AsanProcessInfoCB(const char*, bool*) {
@@ -40,7 +40,7 @@ index 1a75f6e8d733c049a3ef4978e3fb529dc31c944e..9fc6c67e42effeab24e202cfb76b21d9
  #endif  // V8_USE_EXTERNAL_STARTUP_DATA
  }
  
-@@ -1001,7 +1007,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
+@@ -978,7 +984,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
      return TerminateForFatalInitializationError();
  #endif  // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
  

+ 1 - 1
patches/chromium/disable_hidden.patch

@@ -35,7 +35,7 @@ index 99fe44aab8599bffe256e4683ec36441c06925b8..72c5afe5d028c77acb76757698c15a01
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index be9fe00b88a381f8ab0d121e9d112fc981b414fb..3cd53be3dbb0f63b632f0d7bcccfdc1b2e02ccdf 100644
+index 1d08f25b91496dbafc3a164e7fb3e66d1a48557b..92085aca6bd0c95a73b98e4173c0128d596b77f4 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -643,7 +643,7 @@ void RenderWidgetHostViewAura::HideImpl() {

+ 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 d2fbb6060bcce9cb3bcc3829923e2f0e7aa26a75..922c373b9b9be3fc6fc6d7aafdb717c16f4be543 100644
+index 31b7ed755550f73fce87c0edbc01d9d37eeeed25..10ea54ce5e7b6422c0ea9bccce1cece1a225e01e 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -169,6 +169,7 @@
@@ -23,7 +23,7 @@ index d2fbb6060bcce9cb3bcc3829923e2f0e7aa26a75..922c373b9b9be3fc6fc6d7aafdb717c1
  #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"
-@@ -1864,6 +1865,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1865,6 +1866,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);

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

@@ -28,7 +28,7 @@ The patch should be removed in favor of either:
 Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
 
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index 4d12d98e23a2d35c57822d640e2820296c1dce77..757182042dc50608bcb7362f2ee427e9caa8ca2f 100644
+index ecba4ccb033c706658718dbbced19c6e60c53d97..5f4b860a9666e3ba3c557663e05b86ed952fc51f 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -11040,6 +11040,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {

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

@@ -9,10 +9,10 @@ focus node change via TextInputManager.
 chromium-bug: https://crbug.com/1369605
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index fec1cdc083d1cb365188a7635a6c062b275d1f64..6098209b367f6b0f0995bd569c895813c6396340 100644
+index 9503beefcbcfe7d99674582ece10a7e551fae96d..32302e3dae2098319ed2d1f1403649fe8db2887e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -3226,6 +3226,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
+@@ -3229,6 +3229,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
    }
  }
  
@@ -87,7 +87,7 @@ 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 8e63a3052b186962b0aa336e525cea2bc5447f8b..13eee4ac49c364b1714015f22aab517e18e70592 100644
+index c2e1e3dd3be2a5674a2c05846e15058215ad31dd..6540f14c2c94f78282b298d84e65f4680844eb78 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -9768,7 +9768,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(

+ 2 - 2
patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch

@@ -6,7 +6,7 @@ Subject: fix: select the first menu item when opened via keyboard
 This fixes an accessibility issue where the root view is 'focused' to the screen reader instead of the first menu item as with all other native menus. This patch will be upstreamed.
 
 diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
-index e47bc7e9c8f1629a499045e67a9f1bd39dd7d521..c5ed7556f94944ca8686e7007d2ff85b0e84a1cf 100644
+index 6337d0d70f247b06c7871fb7faa75c2b0b7d541c..2bd399161329b054dd67961f767ccc4480af413c 100644
 --- a/ui/views/controls/menu/menu_controller.cc
 +++ b/ui/views/controls/menu/menu_controller.cc
 @@ -700,6 +700,14 @@ void MenuController::Run(Widget* parent,
@@ -24,7 +24,7 @@ index e47bc7e9c8f1629a499045e67a9f1bd39dd7d521..c5ed7556f94944ca8686e7007d2ff85b
    if (button_controller) {
      pressed_lock_ = button_controller->TakeLock(
          false, ui::LocatedEvent::FromIfValid(event));
-@@ -2410,19 +2418,15 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
+@@ -2401,19 +2409,15 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
      }
      item->GetSubmenu()->ShowAt(params);
  

+ 1 - 1
patches/chromium/load_v8_snapshot_in_browser_process.patch

@@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index c3a90e835d216768c07242d42a2b6f3875f06b83..1a75f6e8d733c049a3ef4978e3fb529dc31c944e 100644
+index 82e5123e35509d22493809a37e56be5e9bea4264..054f38d683280638c7ac618d2ff8f7aef1a0def0 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -292,11 +292,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {

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

@@ -579,7 +579,7 @@ index b712b8af0e770aa3acbeb1167b1a20bc1547c98a..fdb476a7e470c4b32649d4b3b7e4e445
    return kAttributes;
  }
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 23906303cc6470d5bc6b83f79e04ec45781ceea0..40f16697ec17c34bb89b1e160164c228f38c1168 100644
+index 2413228f605776322caff19098c6b60183005df5..b392e1ee627c982c4c0b099a6b6ea8a9e698b601 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -339,6 +339,7 @@ source_set("browser") {

+ 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 6735e45e0c879cd0a362d12960eb60148b7de2eb..6fb87b666bd17e0461e422773953dda269f1940e 100644
+index 559f05089b4381fd44dac68c4bc2b1673135f7ff..01364e3ce096312c9ce4f61932eec39521af14c0 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -804,8 +804,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(

+ 1 - 1
patches/chromium/printing.patch

@@ -881,7 +881,7 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b
    ScriptingThrottler scripting_throttler_;
  
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 40f16697ec17c34bb89b1e160164c228f38c1168..127c2aa62a8c4e9113ce5e378ceddc6abd6b41f4 100644
+index b392e1ee627c982c4c0b099a6b6ea8a9e698b601..a2e944cb987f739d75428649793e622400ed0213 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -3123,8 +3123,9 @@ source_set("browser") {

+ 1 - 1
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch

@@ -44,7 +44,7 @@ index f13799f1cc440a20d8e3c55ee35f64e6505e5590..e46e5eb74c54bc00ead6e2e4eff99fd5
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 0cfe3659fd5b7abab99caeed2bed6c5f209ec310..e069c6e05803ecdca4b2ee39311b92c6eed8c3f8 100644
+index d204a45939c7318697c5eb0d6efe7bc7fe94b4d1..2fb39006ca697d3b16507e3000bff2768b334092 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -5810,6 +5810,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {

+ 1 - 1
patches/chromium/refactor_unfilter_unresponsive_events.patch

@@ -15,7 +15,7 @@ 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 4eca2f7360dd15572521cdb2015f442b300b4c2e..d41dccfb1b400b287410bb2aab5bc6b1a060edff 100644
+index f4bebb35fe53e4fd68bd8519a0bfab8414b64bda..7fb622c71ff6852f39f4cd2cd8472811c459e84f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -9905,25 +9905,13 @@ void WebContentsImpl::RendererUnresponsive(

+ 1 - 1
patches/chromium/web_contents.patch

@@ -9,7 +9,7 @@ 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 c8584558087a55b5b098f729d208bfc859a8c5d2..bcb2bfb324d6785d25da6f750e555cd3934432c1 100644
+index 6992093d069f0d9a50eab29cdd36bffba586eca9..deae9c82c8cce046732510263faf758756c77cfa 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -3882,6 +3882,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,

+ 3 - 3
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 2bff13ef0d15b45010a4e8baf3ac984fb5af397c..6735e45e0c879cd0a362d12960eb60148b7de2eb 100644
+index ee3ea03f0c60066330bc5c9f02e4c2beeafd136b..559f05089b4381fd44dac68c4bc2b1673135f7ff 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -8727,6 +8727,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -8737,6 +8737,17 @@ void RenderFrameHostImpl::EnterFullscreen(
      }
    }
  
@@ -37,7 +37,7 @@ index 2bff13ef0d15b45010a4e8baf3ac984fb5af397c..6735e45e0c879cd0a362d12960eb6014
    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 bcb2bfb324d6785d25da6f750e555cd3934432c1..8e63a3052b186962b0aa336e525cea2bc5447f8b 100644
+index deae9c82c8cce046732510263faf758756c77cfa..c2e1e3dd3be2a5674a2c05846e15058215ad31dd 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -4157,21 +4157,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(

+ 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 469a7440eb5a0306a48e33668453a998ca5fe093..8cf1b93049a16d7bad1c64269b180fdba6d08ef3 100644
+index 117f738fa274ffdb79e1666a5de322fb163d19b8..d8f512c9b4284571bc96285a64f8d0faf1826c52 100644
 --- a/front_end/entrypoints/main/MainImpl.ts
 +++ b/front_end/entrypoints/main/MainImpl.ts
-@@ -787,6 +787,8 @@ export class MainImpl {
+@@ -760,6 +760,8 @@ export class MainImpl {
  globalThis.Main = globalThis.Main || {};
  // @ts-expect-error Exported for Tests.js
  globalThis.Main.Main = MainImpl;

+ 0 - 2
shell/browser/api/electron_api_session.cc

@@ -152,8 +152,6 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
     auto type = base::ToLowerASCII(it);
     if (type == "temporary")
       quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
-    else if (type == "syncable")
-      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
   }
   return quota_mask;
 }

+ 1 - 1
spec/ts-smoke/electron/main.ts

@@ -1177,7 +1177,7 @@ session.defaultSession.clearStorageData({ storages: ['shadercache', 'cachestorag
 // @ts-expect-error Invalid type value
 session.defaultSession.clearStorageData({ storages: ['wrong_path'] });
 
-session.defaultSession.clearStorageData({ quotas: ['syncable', 'temporary'] });
+session.defaultSession.clearStorageData({ quotas: ['temporary'] });
 // @ts-expect-error Invalid type value
 session.defaultSession.clearStorageData({ quotas: ['bad_type'] });