From cee9bfb470276965769bd7a18475e75a75d263f7 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:53:04 +0000 Subject: [PATCH 01/27] chore: bump chromium in DEPS to 122.0.6223.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6bb9098032b0d..f963395c6a816 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6194.0', + '122.0.6223.0', 'node_version': 'v20.10.0', 'nan_version': From 6497884c821ab70c6c072d784d9c3a7f9dd472c0 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 10:06:25 +0100 Subject: [PATCH 02/27] 5129828: Removes special cases for selenium-atoms dependencies. https://chromium-review.googlesource.com/c/chromium/src/+/5129828 --- .../chromium/add_electron_deps_to_license_credits_file.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chromium/add_electron_deps_to_license_credits_file.patch b/patches/chromium/add_electron_deps_to_license_credits_file.patch index 3f690f684d2f7..3d9a9856bbbc7 100644 --- a/patches/chromium/add_electron_deps_to_license_credits_file.patch +++ b/patches/chromium/add_electron_deps_to_license_credits_file.patch @@ -12,7 +12,7 @@ index 30f81dd2bf32205867d5dd5f72ed308e4abbfcc5..8f9a59dd4fe6f779ea4fc736693eb5cb +++ b/tools/licenses/licenses.py @@ -425,6 +425,31 @@ SPECIAL_CASES = { "License": "Apache 2.0", - "License File": ["//third_party/selenium-atoms/LICENSE.closure"], + "License File": ["//third_party/dawn/third_party/khronos/LICENSE"], }, + os.path.join('third_party', 'electron_node'): { + "Name": "Node.js", From 4969e65ec1618befaa06d87498abe5895c7045c4 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 10:10:51 +0100 Subject: [PATCH 03/27] chore: fixup patch indices --- .../add_didinstallconditionalfeatures.patch | 6 ++--- ...lectron_deps_to_license_credits_file.patch | 4 ++-- ...er_to_linuxui_getwindowframeprovider.patch | 18 +++++++-------- ..._scheduler_throttling_per_renderview.patch | 12 +++++----- .../build_add_electron_tracing_category.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 16 +++++++------- patches/chromium/can_create_window.patch | 18 +++++++-------- ...hore_add_electron_deps_to_gitignores.patch | 6 ++--- ...dle_synthetic_mouse_events_for_touch.patch | 4 ++-- ..._introduce_blocking_api_for_electron.patch | 8 +++---- ...screationoverridden_with_full_params.patch | 10 ++++----- ...e_browser_v8_snapshot_file_name_fuse.patch | 10 ++++----- .../disable_color_correct_rendering.patch | 12 +++++----- patches/chromium/disable_hidden.patch | 4 ++-- ...nable_partition_alloc_ref_count_size.patch | 2 +- .../chromium/enable_reset_aspect_ratio.patch | 2 +- ...xpose_setuseragent_on_networkcontext.patch | 12 +++++----- .../extend_apply_webpreferences.patch | 4 ++-- ..._raw_response_headers_from_urlloader.patch | 4 ++-- ...ding_non-standard_schemes_in_iframes.patch | 4 ++-- ...board_hides_on_input_blur_in_webview.patch | 4 ++-- ...original_resize_performance_on_macos.patch | 2 +- patches/chromium/frame_host_manager.patch | 6 ++--- .../gin_enable_disable_v8_platform.patch | 6 ++--- .../chromium/gritsettings_resource_ids.patch | 4 ++-- ...sync_with_host_os_mac_on_linux_in_ci.patch | 2 +- .../load_v8_snapshot_in_browser_process.patch | 2 +- ..._avoid_private_macos_api_usage.patch.patch | 22 +++++++++---------- ...emote_certificate_verification_logic.patch | 22 +++++++++---------- .../chromium/notification_provenance.patch | 4 ++-- patches/chromium/printing.patch | 4 ++-- ...r_changes_to_the_webcontentsobserver.patch | 6 ++--- patches/chromium/resource_file_conflict.patch | 2 +- patches/chromium/scroll_bounce_flag.patch | 4 ++-- .../support_mixed_sandbox_with_zygote.patch | 2 +- patches/chromium/web_contents.patch | 6 ++--- patches/chromium/webview_fullscreen.patch | 10 ++++----- ...8_object_setinternalfieldfornodecore.patch | 4 ++-- 38 files changed, 135 insertions(+), 135 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index ee907126b2e43..06347a34830f0 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,7 +23,7 @@ index 79162faef6654f52651ffdff5705f7b27d2ae4f2..8148896d3f12772a1b4ba04601c57d9e int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c7ecc1b876e6825c76155d28bb8a8d0aabeb49fd..9305000541b1ac9c232ffb364ed21f120e417cdb 100644 +index 760adefe3056e628a551218526529ccaa60049e7..35c5ade30918fd9f47b86922880d2a790e98b60d 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4564,6 +4564,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, @@ -123,10 +123,10 @@ index 8a16e37c32d29d21b0358f2a9dbe61b962d615a7..a1a73ebbeb0288f7e14280fa277451e0 int32_t world_id) override; diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h -index 97bd9953e14088517a80b44c244f2bacf3b699bb..e67b3126f1082ecd2b6867ae01ab30d4c6ea41c5 100644 +index 33d568ea38f0de2c02a40c217ceaf8a711cddc47..47dab797a32b8832e9380c89cad92546233d9351 100644 --- a/third_party/blink/renderer/core/loader/empty_clients.h +++ b/third_party/blink/renderer/core/loader/empty_clients.h -@@ -406,6 +406,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { +@@ -409,6 +409,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { void DidCreateScriptContext(v8::Local, int32_t world_id) override {} diff --git a/patches/chromium/add_electron_deps_to_license_credits_file.patch b/patches/chromium/add_electron_deps_to_license_credits_file.patch index 3d9a9856bbbc7..88c8853023c49 100644 --- a/patches/chromium/add_electron_deps_to_license_credits_file.patch +++ b/patches/chromium/add_electron_deps_to_license_credits_file.patch @@ -7,10 +7,10 @@ Ensure that licenses for the dependencies introduced by Electron are included in `LICENSES.chromium.html` diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py -index 30f81dd2bf32205867d5dd5f72ed308e4abbfcc5..8f9a59dd4fe6f779ea4fc736693eb5cb31ab002d 100755 +index cc7b17e13c4c8b9e483df9a097b23935ab2e56bc..b89810659dab27dd8150c0b7185ea2b679ab98a4 100755 --- a/tools/licenses/licenses.py +++ b/tools/licenses/licenses.py -@@ -425,6 +425,31 @@ SPECIAL_CASES = { +@@ -336,6 +336,31 @@ SPECIAL_CASES = { "License": "Apache 2.0", "License File": ["//third_party/dawn/third_party/khronos/LICENSE"], }, diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch index 0206193703fa0..c17dd1b532324 100644 --- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch +++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch @@ -53,10 +53,10 @@ index 38c1297588f30cc81d48cfd2321845815bb93ea5..0f4141d2146c38f054b060ddfa06a9f6 // Objects to notify when the window frame button order changes. base::ObserverList::Unchecked diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc -index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553c33f5d9b 100644 +index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc9dec6800 100644 --- a/ui/gtk/window_frame_provider_gtk.cc +++ b/ui/gtk/window_frame_provider_gtk.cc -@@ -39,17 +39,20 @@ std::string GetThemeName() { +@@ -40,17 +40,20 @@ std::string GetThemeName() { return theme_string; } @@ -80,7 +80,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 // GTK4 renders the decoration directly on the window. if (!GtkCheckVersion(4)) { context = AppendCssNodeToStyleContext(context, "decoration"); -@@ -68,8 +71,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) { +@@ -69,8 +72,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) { return context; } @@ -91,7 +91,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 context = AppendCssNodeToStyleContext(context, "headerbar.header-bar.titlebar"); if (!focused) { -@@ -125,8 +128,8 @@ int ComputeTopCornerRadius() { +@@ -129,8 +132,8 @@ int ComputeTopCornerRadius() { // need to experimentally determine the corner radius by rendering a sample. // Additionally, in GTK4, the headerbar corners get clipped by the window // rather than the headerbar having its own rounded corners. @@ -102,7 +102,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 ApplyCssToContext(context, R"(window, headerbar { background-image: none; background-color: black; -@@ -159,7 +162,7 @@ int ComputeTopCornerRadius() { +@@ -163,7 +166,7 @@ int ComputeTopCornerRadius() { bool HeaderIsTranslucent() { // The arbitrary square size to render a sample header. constexpr int kHeaderSize = 32; @@ -111,7 +111,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 double opacity = GetOpacityFromContext(context); if (opacity < 1.0) { return true; -@@ -216,8 +219,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom( +@@ -220,8 +223,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom( unfocused_bitmap = src.unfocused_bitmap; } @@ -122,7 +122,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 WindowFrameProviderGtk::~WindowFrameProviderGtk() = default; -@@ -325,7 +328,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( +@@ -329,7 +332,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( top_area_height_dip * scale - effective_frame_thickness_px.top(); auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px}, @@ -131,7 +131,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 image = gfx::ImageSkia::CreateFrom1xBitmap(header); // In GTK4, the headerbar gets clipped by the window. if (GtkCheckVersion(4)) { -@@ -358,7 +361,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { +@@ -362,7 +365,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip, 2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip); @@ -140,7 +140,7 @@ index 1f4eeebe54780a4927104d7cdaa4f7cfae6e7d2a..64d243287a367ff4201efebeda95f553 frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context)); frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context)); gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset)); -@@ -366,7 +369,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { +@@ -370,7 +373,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale); asset.unfocused_bitmap = PaintBitmap(bitmap_size, frame_bounds_dip, diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index 90453b2396248..4c61ecfb49fa9 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -23,7 +23,7 @@ index ed1cd91f4ec979f5a194a110ce9fc6ae3459cd09..812534c3834094f762b81daea204c85e return receiver_.BindNewEndpointAndPassDedicatedRemote(); } diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index 401a00dba286c3c7a45bbcdd69f32fc21eb2daf7..9f6d393c9a7c7ce8d9d1049c2259f8837ab8371e 100644 +index 14cddd19bc4cb2be3fbffc077907a11668c54f1c..2222b3ff14b06c7515133c6bf8443baeeb201f66 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -713,6 +713,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { @@ -116,10 +116,10 @@ index 2ba868f0efb2ee082d452bb011409f1b4c5c5e1e..6caab2df3cfc367c63839b7ac635d8d0 // 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 81a6dbe0c3efc859cdd6124f2ff328b424e297c5..5a70b02f2217cf3c0e8d9a2cca8e2d565b6057bc 100644 +index 169c9f73199d648b0513d5b4760c179be26ec1f0..26297bd0f723b3d62a4fc1b2a5ba5a214e15488b 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -2421,6 +2421,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( +@@ -2423,6 +2423,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal", "old_state", old_state, "new_state", new_state); @@ -130,7 +130,7 @@ index 81a6dbe0c3efc859cdd6124f2ff328b424e297c5..5a70b02f2217cf3c0e8d9a2cca8e2d56 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 && -@@ -3904,10 +3908,23 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3921,10 +3925,23 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } @@ -155,7 +155,7 @@ index 81a6dbe0c3efc859cdd6124f2ff328b424e297c5..5a70b02f2217cf3c0e8d9a2cca8e2d56 // 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 3aeffb166b2b8680fe226aec40febc928c272661..e9bac30aae75901dd07f1e28110289915d8d789e 100644 +index ae8bc75679ad4064ea0bb19f36e3b8224db9d738..c227b904fef4acc76a4af50263ab9d4fa35472e2 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.h +++ b/third_party/blink/renderer/core/exported/web_view_impl.h @@ -453,6 +453,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -166,7 +166,7 @@ index 3aeffb166b2b8680fe226aec40febc928c272661..e9bac30aae75901dd07f1e2811028991 void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state, bool is_initial_state) override; mojom::blink::PageVisibilityState GetVisibilityState() override; -@@ -918,6 +919,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -924,6 +925,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, // If true, we send IPC messages when |preferred_size_| changes. bool send_preferred_size_changes_ = false; diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch index c640c61e279a8..2278757c8f6fb 100644 --- a/patches/chromium/build_add_electron_tracing_category.patch +++ b/patches/chromium/build_add_electron_tracing_category.patch @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us to introduce a new Electron category for Electron-specific tracing. diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 0cc26b32992cbbd5f599e0e062dd5b22bbf6d2dc..2bc3fea0bc469a0cf26fa2a5af9c404294078f4a 100644 +index f82e41ee24e1dad66fc983492b3bc6461d6a254c..d0655deb5ded85a76b1cca1cab81320cd804c938 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h @@ -82,6 +82,7 @@ diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 20b9f9e2b0503..d76acafeabe23 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/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 4b4545013d6de396a660b234ded3f16f8bb0e983..36b8ac1ee569041d7687f457320aa8f6e4b26f85 100644 +index 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449ffcc30ddc 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -200,11 +200,16 @@ if (!is_android && !is_mac && !is_fuchsia) { @@ -33,10 +33,10 @@ index 4b4545013d6de396a660b234ded3f16f8bb0e983..36b8ac1ee569041d7687f457320aa8f6 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index ea574b1863e186401094d9e9d55c08c10424b671..b7cdbd3f650c37c798e6d95f4f3721ead3ad1fbf 100644 +index 225f9e9010ef911355e23b1e31e3e298550b1068..4ece05ccf4c0728bca2d4a88468642211b551f4d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4750,7 +4750,7 @@ static_library("browser") { +@@ -4746,7 +4746,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 ea574b1863e186401094d9e9d55c08c10424b671..b7cdbd3f650c37c798e6d95f4f3721ea sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 09cf5b94c26c978d4a41b7e634a394a946783a4d..188755a0031c98be54fc58e232f0e6066f7e7931 100644 +index 0c5f06e5a0990fb0ff6e37a101c5dbc93f00b252..b3ef1882018d21b9bc978a36be2976aa864eb9a0 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7179,7 +7179,6 @@ if (!is_fuchsia) { +@@ -7185,7 +7185,6 @@ if (!is_fuchsia) { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index 09cf5b94c26c978d4a41b7e634a394a946783a4d..188755a0031c98be54fc58e232f0e606 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -7200,6 +7199,10 @@ if (!is_fuchsia) { +@@ -7206,6 +7205,10 @@ if (!is_fuchsia) { "//ui/resources", ] @@ -68,7 +68,7 @@ index 09cf5b94c26c978d4a41b7e634a394a946783a4d..188755a0031c98be54fc58e232f0e606 ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -8223,7 +8226,6 @@ if (!is_fuchsia) { +@@ -8227,7 +8230,6 @@ if (!is_fuchsia) { } deps += [ @@ -76,7 +76,7 @@ index 09cf5b94c26c978d4a41b7e634a394a946783a4d..188755a0031c98be54fc58e232f0e606 "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter", -@@ -8316,6 +8318,10 @@ if (!is_fuchsia) { +@@ -8320,6 +8322,10 @@ if (!is_fuchsia) { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 7d44aabfaa6ef..fa242ce0fd857 100644 --- a/patches/chromium/can_create_window.patch +++ b/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 077a3c49768aa24591b0eb4a438cd87c38208200..429f9e77be832297448bdcd020b7878d3c07703f 100644 +index ae5a97f5e0961cc0116b5be337e4a6c484703dea..3cd17df056104948ea7ea373f25129a276c8d288 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8259,6 +8259,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -8250,6 +8250,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index 077a3c49768aa24591b0eb4a438cd87c38208200..429f9e77be832297448bdcd020b7878d &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 84c061364bcfe27ce5631d567ac80dcc5cb1dc12..213cfa19ecd8f831107e1e6cff5c38480f3715a7 100644 +index d425d19cecbb4a25bbec27c9236244c25d449aae..3e2bd94628cdfadc07aeb6a570a4bbe6c0432865 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4490,6 +4490,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4496,6 +4496,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( auto* new_contents_impl = new_contents.get(); @@ -37,7 +37,7 @@ index 84c061364bcfe27ce5631d567ac80dcc5cb1dc12..213cfa19ecd8f831107e1e6cff5c3848 // 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 -@@ -4531,12 +4537,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4537,12 +4543,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -79,7 +79,7 @@ index 1c5717272933f75d789d9b727402d2c2cf13cbb0..56d476fa09a1648451b9f0e14c298024 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 966f79ab782fac2cfb4234eb333c423205467820..83aa3dd465cb02a3b15852764c00746c205b5b0f 100644 +index 2549daafcb3c39642015efa0538fb4ace29756c9..9f69a4daad85f17da49ac49aa2d79fcdd44a5049 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -181,6 +181,7 @@ class NetworkService; @@ -148,7 +148,7 @@ index 4b32bf8ccc4ed370e2d1a218ae1fd69a98e23636..b9168a2488f5c4977eba5856882b561e // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c5d2bb8e92d8341e791d78310d9984ea8d8b4b92..c7ecc1b876e6825c76155d28bb8a8d0aabeb49fd 100644 +index 2f0ea25dab58f9750749f8c25b3acd60ec2c655e..760adefe3056e628a551218526529ccaa60049e7 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -6551,6 +6551,10 @@ WebView* RenderFrameImpl::CreateNewWindow( @@ -210,10 +210,10 @@ index bef5a989bac50c177f15f52fe87ac3790d553e85..65dcd2e3b51929400c8bfb6a98a4fb59 } // 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 de9377575794e93864db43b59807e3af6c16f33d..338ce9de5de984ecfdf68bb17736e45a400ed8c9 100644 +index 533b96d14e0e4599b0a404eb2f74bce6fb12f983..378640bfa4bc6adabd34f2ee759e60a8ea376e72 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -2233,6 +2233,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2203,6 +2203,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, WebWindowFeatures window_features = GetWindowFeaturesFromString(features, entered_window); diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch index 1e455b5edd4ed..9fd9b7aaf0af0 100644 --- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch +++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch @@ -18,7 +18,7 @@ index 2f9164594b1bbf9f6d7af875ab65ee0cb24b1227..4c969db1812ef64647e9d8f139961911 /googleurl /gpu/gles2_conform_test diff --git a/third_party/.gitignore b/third_party/.gitignore -index 3674dd13b4b2325790fbbdffb8631842594f9f8b..c31304f547a8ad07d846ea2c054360745ea409fd 100644 +index b3a55406876238186561a16a1d0c1170703b0fc8..f34f5340ae4dc682f5ada66e0217372e26c35e82 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -51,6 +51,7 @@ @@ -29,7 +29,7 @@ index 3674dd13b4b2325790fbbdffb8631842594f9f8b..c31304f547a8ad07d846ea2c05436074 /elfutils/src /espresso/lib/ /eyesfree/src -@@ -110,6 +111,7 @@ +@@ -104,6 +105,7 @@ /mocha /mockito/src /nacl_sdk_binaries/ @@ -37,7 +37,7 @@ index 3674dd13b4b2325790fbbdffb8631842594f9f8b..c31304f547a8ad07d846ea2c05436074 /ninja/ninja* /node/*.tar.gz /node/linux/ -@@ -153,6 +155,7 @@ +@@ -147,6 +149,7 @@ /soda-win64 /speex /sqlite4java/lib/ diff --git a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch index c8c16d86aa67d..f46f399f67443 100644 --- a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch +++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch @@ -7,10 +7,10 @@ With WCO, allow chromium to handle synthetic mouse events generated for touch actions in the non-client caption area. diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index a85fa97d213058196e4703166cf974497e89e2d6..39778ad7cdfec863d1acb7eb51438f5070c47318 100644 +index a51018a455c114d9c3b15dd2628e6ab6bfc3da38..1fec1bfa23c5ae67317b6f4c2bc8f341f3eb1d85 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -@@ -1222,6 +1222,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged( +@@ -1226,6 +1226,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged( window()->SetProperty(aura::client::kHeadlessBoundsKey, bounds); } diff --git a/patches/chromium/chore_introduce_blocking_api_for_electron.patch b/patches/chromium/chore_introduce_blocking_api_for_electron.patch index fd2ac3d98beae..a6f0f0c0e13c2 100644 --- a/patches/chromium/chore_introduce_blocking_api_for_electron.patch +++ b/patches/chromium/chore_introduce_blocking_api_for_electron.patch @@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor of explicitly adding ScopedAllowBlocking calls as friends. diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 67f0ff1785559143cbff0e81e6630c4d5a86bc90..c049707872f2585535b03fb5b55463b2d4323d16 100644 +index bfdfa06b2b2fab3f7b5f027bd1840a1218ead7ee..16d8d70d94b53b8b7930bd39e90a463ed1a3f79f 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -135,6 +135,7 @@ class KeyStorageLinux; @@ -18,7 +18,7 @@ index 67f0ff1785559143cbff0e81e6630c4d5a86bc90..c049707872f2585535b03fb5b55463b2 class Profile; class ProfileImpl; class ScopedAllowBlockingForProfile; -@@ -270,6 +271,9 @@ class BackendImpl; +@@ -273,6 +274,9 @@ class BackendImpl; class InFlightIO; bool CleanupDirectorySync(const base::FilePath&); } // namespace disk_cache @@ -28,7 +28,7 @@ index 67f0ff1785559143cbff0e81e6630c4d5a86bc90..c049707872f2585535b03fb5b55463b2 namespace enterprise_connectors { class LinuxKeyRotationCommand; } // namespace enterprise_connectors -@@ -559,6 +563,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { +@@ -563,6 +567,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { friend class ::DesktopNotificationBalloon; friend class ::FirefoxProfileLock; friend class ::GaiaConfig; @@ -36,7 +36,7 @@ index 67f0ff1785559143cbff0e81e6630c4d5a86bc90..c049707872f2585535b03fb5b55463b2 friend class ::ProfileImpl; friend class ::ScopedAllowBlockingForProfile; friend class ::StartupTabProviderImpl; -@@ -597,6 +602,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { +@@ -601,6 +606,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { friend class crosapi::LacrosThreadTypeDelegate; friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847 friend class drive::FakeDriveService; diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index d32828ae5e4a4..d1e5aaac2dea4 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -80,10 +80,10 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685 } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index e8310edc4c783976f9cb1a6624084812676d1f5c..45aedec3b34103f734415413241849054b5b0aed 100644 +index d611c512dfe0307a99b0fdaec23a2f3dbbb9d905..b5f1a098471cd726117b3dde146444d6d186fae1 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -1885,12 +1885,11 @@ bool Browser::IsWebContentsCreationOverridden( +@@ -1884,12 +1884,11 @@ bool Browser::IsWebContentsCreationOverridden( content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, @@ -99,7 +99,7 @@ index e8310edc4c783976f9cb1a6624084812676d1f5c..45aedec3b34103f73441541324184905 WebContents* Browser::CreateCustomWebContents( diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 456bdd201ed3f4a136857d84d0f5b9889c857980..7ee6a0b58d5e435cdca5dfb4e10858527e8f4658 100644 +index 626a509aa34e6ec5f2ed30b4f9e6d4144f723134..956d1094180f2af239d32c3226fcd43b1826dd3d 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -890,8 +890,7 @@ class Browser : public TabStripModelObserver, @@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b057b66c99a7f91b40b803f51e9b1c225e4bba4a..81c2ea6d3266068593388211043c670bbdffe006 100644 +index b105731ae674c17a2200a1407ddc7c0c0d079481..f613979626d88506c28e66a48165d9efc1f0f63c 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4396,8 +4396,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4402,8 +4402,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, diff --git a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch index d0dbb9526ce95..5bbb1121be862 100644 --- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch +++ b/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 83da453659ed0007d2be4079e1b102245cc27268..79c2bbc0c8c3345fd58b6e18408062eeed94c85e 100644 +index 496cf165cd37711fcb27fe74e4d3b00709941d19..003a7fd18179ed1df339eeb178b9a2e10a31520f 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc @@ -39,6 +39,7 @@ @@ -48,7 +48,7 @@ index 83da453659ed0007d2be4079e1b102245cc27268..79c2bbc0c8c3345fd58b6e18408062ee #endif // V8_USE_EXTERNAL_STARTUP_DATA } -@@ -965,7 +972,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) { +@@ -967,7 +974,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) { return TerminateForFatalInitializationError(); #endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) @@ -102,10 +102,10 @@ index c891c5649a6ae76c9f0f988359649ece0e8ac1d9..54e30c4dd82042c283e36cae767dcdd7 friend class ContentClientCreator; friend class ContentClientInitializer; diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index af5eb8ae2efd2544889250537f0014d318aaa2ab..59daad3f2460939ccb046508d7733a94460a571d 100644 +index 7672c5f8f2e7507ddc39f4a2e94646844f7f3121..cc8c9d3be947914c1c600ec23cac49404e973bac 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc -@@ -559,8 +559,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, +@@ -576,8 +576,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, #if defined(V8_USE_EXTERNAL_STARTUP_DATA) @@ -115,7 +115,7 @@ index af5eb8ae2efd2544889250537f0014d318aaa2ab..59daad3f2460939ccb046508d7733a94 if (g_mapped_snapshot) { // TODO(crbug.com/802962): Confirm not loading different type of snapshot // files in a process. -@@ -569,10 +568,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { +@@ -586,10 +585,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { base::MemoryMappedFile::Region file_region; base::File file = diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index e6a521bd74f0c..05ab69821bf82 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 9066427f903cb78b75ff72f3653495c4f66028c8..41511b0d089598c505cac3b6197b0e63089eaf06 100644 +index cb9d275b54d95d2df68b481ed7ce73b9e4aa83b2..e6fb1db611d5314176ddbc909cfbf25965a45dca 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1888,6 +1888,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1891,6 +1891,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( TargetColorParams LayerTreeHostImpl::GetTargetColorParams( gfx::ContentColorUsage content_color_usage) const { TargetColorParams params; @@ -93,10 +93,10 @@ index 53e23c2b791b9f8851ecac455c3adefd8fc37688..857b648acf17742e7d904ece93ee113f sandbox::policy::switches::kGpuSandboxAllowSysVShm, sandbox::policy::switches::kGpuSandboxFailuresFatal, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 82b4a00f9c66627ef897c717a0f2e93ac0f13e08..195b147c927c1b09dc24928ec4e3755b3ee1af14 100644 +index 0fa0effecebf1437181c02e477762ef4f33e9aaf..36351f2c0d82d7ffc9c03e8d9ca043652cab7fb6 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3357,6 +3357,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3362,6 +3362,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( // Propagate the following switches to the renderer command line (along // with any associated values) if present in the browser command line. static const char* const kSwitchNames[] = { @@ -170,7 +170,7 @@ index ab5742a30a9d8319ec4596bb99313ea05841e316..5ffc2a38f66f3ab2c82102e996f8e931 // is what the renderer uses if its not threaded. settings.enable_checker_imaging = diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc -index 8a4e2f567831f5a295346062302470d2705ad9a4..2f9d13f03fc943342c156b676a7244348943d85f 100644 +index a66a9eacee191c7be9ed172b8db1dcd02f983d49..25e251f5afa50fb3bb0cab74efb740ea621cbab7 100644 --- a/ui/gfx/mac/io_surface.cc +++ b/ui/gfx/mac/io_surface.cc @@ -21,6 +21,7 @@ @@ -196,7 +196,7 @@ index 8a4e2f567831f5a295346062302470d2705ad9a4..2f9d13f03fc943342c156b676a724434 // Allow but ignore invalid color spaces. if (!color_space.IsValid()) return true; -@@ -342,6 +351,15 @@ base::apple::ScopedCFTypeRef CreateIOSurface( +@@ -340,6 +349,15 @@ base::apple::ScopedCFTypeRef CreateIOSurface( DCHECK_EQ(kIOReturnSuccess, r); } diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 9d562234f9b78..60c3fe8840a7d 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ 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 fd723c19a4861721abb47ded1d1281d1c3235716..4b9f416e501a1c5af64e9e716a0ce47cfc32af1c 100644 +index 47e2208da837f454d3bd6aa7cdcabe6249fe6859..28ad2c8655d8c1d7797af01aca30223e767bffad 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -832,6 +832,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -20,7 +20,7 @@ index fd723c19a4861721abb47ded1d1281d1c3235716..4b9f416e501a1c5af64e9e716a0ce47c 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 e78085c9eae180daa58fb66f5c12fa8c53ccd8e1..cc9c023daf63551875aa97a0ffa93d2aa6dfe1bd 100644 +index 9bcff210b9ae9922f30b5c38051beba6dfda8aac..74578e01c03cad64f87809f69a4a63c27bd08d10 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -914,6 +914,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/chromium/enable_partition_alloc_ref_count_size.patch b/patches/chromium/enable_partition_alloc_ref_count_size.patch index 26d67dc9c47ce..5bfd2d2118fa7 100644 --- a/patches/chromium/enable_partition_alloc_ref_count_size.patch +++ b/patches/chromium/enable_partition_alloc_ref_count_size.patch @@ -10,7 +10,7 @@ This patch is currently being added upstream, and can be removed when we integrate the upstream changes into Electron. diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h b/base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h -index adc3160a0bb52af8d8ddecd05eeff63ae1f67fd3..2dc40cc55fb5d5d6724d8114718c0bf1bc044564 100644 +index cfc0e1092fc560408c75c54d033cf76c5ef9348a..8ca7df7d43c11229149385156d3390a717428a27 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h @@ -32,7 +32,7 @@ namespace partition_alloc::internal { diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch index 5eb08545f99c5..7b19c5e5a518b 100644 --- a/patches/chromium/enable_reset_aspect_ratio.patch +++ b/patches/chromium/enable_reset_aspect_ratio.patch @@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0 Make SetAspectRatio accept 0 as valid input, which would reset to null. diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index e4ab78b55cf4a2aee0c06bb0fc7732ad6aeb367e..a85fa97d213058196e4703166cf974497e89e2d6 100644 +index 5e613d18403997123fb665792c0275643e91a6e9..a51018a455c114d9c3b15dd2628e6ab6bfc3da38 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -579,7 +579,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) { diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index 0e9ff1964bb5d..8a12ca4f78d64 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4 } // namespace net diff --git a/services/network/network_context.cc b/services/network/network_context.cc -index f176d1a7086305a9f06a6dca3c4fc428cdf73d0c..dfd215d86da7e319534d5f410051bbdbd1c13fd8 100644 +index a17b1a681e7473190c010db528d1ce4b24af876a..56ab055a6022fee0177e43bfc9d5be2cb76a6939 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -1534,6 +1534,13 @@ void NetworkContext::SetNetworkConditions( +@@ -1525,6 +1525,13 @@ void NetworkContext::SetNetworkConditions( std::move(network_conditions)); } @@ -51,10 +51,10 @@ index f176d1a7086305a9f06a6dca3c4fc428cdf73d0c..dfd215d86da7e319534d5f410051bbdb // 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 fceb8d8a2daae235380fca7a163be001d0c19aa3..71e2834a361a23f5808eacdec8e67ce4e6691d14 100644 +index bd06da51ad2106b6a95abb9d773d66ca7d4f8c15..68afc1e30d65fd19923d7e5699e7e07c5acb8ce8 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -317,6 +317,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -316,6 +316,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext void CloseIdleConnections(CloseIdleConnectionsCallback callback) override; void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, mojom::NetworkConditionsPtr conditions) override; @@ -63,7 +63,7 @@ index fceb8d8a2daae235380fca7a163be001d0c19aa3..71e2834a361a23f5808eacdec8e67ce4 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 a9212c8c51ce96c4313dfc8f955be737f5917079..c2fc030544303f7d6a6173728cddc76adce71ad3 100644 +index 7309c263eb58a21129427c8fbb47feb2ef8f1c77..9ea5b55338c2a0351996fa7e1c12445a91dab9e4 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -1240,6 +1240,9 @@ interface NetworkContext { @@ -77,7 +77,7 @@ index a9212c8c51ce96c4313dfc8f955be737f5917079..c2fc030544303f7d6a6173728cddc76a SetAcceptLanguage(string new_accept_language); diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h -index 7bf8209052544647721535a331825286fee478dc..eb0461d8b5fe881128c177859a8b4326078f5539 100644 +index be94ed854cb5cf9e165e7e83a2e8cd3d3ab498cd..fca5afdc4a260559d5c7198de4686615ba4c09b3 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 { diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index 062d98bdde905..ac0bc2d340020 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/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 5a70b02f2217cf3c0e8d9a2cca8e2d565b6057bc..ad261f6c3079d88571bfd356aad74986af81a958 100644 +index 26297bd0f723b3d62a4fc1b2a5ba5a214e15488b..9f05b6a81590c6a4168d70dfbb2ac6f5ee039ab3 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -167,6 +167,7 @@ @@ -23,7 +23,7 @@ index 5a70b02f2217cf3c0e8d9a2cca8e2d565b6057bc..ad261f6c3079d88571bfd356aad74986 #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" -@@ -1796,6 +1797,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, +@@ -1798,6 +1799,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, #if BUILDFLAG(IS_MAC) web_view_impl->SetMaximumLegibleScale( prefs.default_maximum_page_scale_factor); diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch index 6e43ceeceb9c3..96704b1b1b28d 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -153,10 +153,10 @@ index f91b4acdf8da956909f2a51f9b2c065958f87f0c..fdf061bdf13948884dccb5c24f761bc3 // 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 ce0ad0f7e6b831e51d6195a75419c9072851ffa0..3242a07e17eae9d2d3223d3e48b689a99add5e64 100644 +index 2403422bbd7e13fefb96cdd80d25fe928a8e439c..67e33d9ba9509353a5f00d5477d52ab781f95a1e 100644 --- a/services/network/url_loader.h +++ b/services/network/url_loader.h -@@ -636,6 +636,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader +@@ -635,6 +635,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader std::unique_ptr resource_scheduler_request_handle_; diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 1bfc63fd9c903..814d8cf5bcb09 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/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 bceffd4976353b4ece2959acd69ffd6d9a6f594e..89c7f7848afba03ffd78ae1c0056125019578c18 100644 +index 066a0223ec5fdc7e91ea24288e647cfbb6728a26..3afb8dd39b4063bd2f702d45941403a42e4e2aab 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -10048,6 +10048,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { +@@ -10049,6 +10049,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { return std::make_pair(parent->GetLastCommittedOrigin(), "about_srcdoc"); } diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index 3037aa0e51dd9..bb392c755962e 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -45,10 +45,10 @@ index e340087e3ab2f07937ed6e6bd8e0ec8aa2a76d48..2b29e246b2f6ecf5d7605abfa3602864 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b12ee61f31aa591011e575772546e5149dc697fc..8e28f573e42f855643fed5ac621671877383ae2a 100644 +index e7778ffef3c737d69af2713820027776f4119a64..af8013e028353360dae1d892ed507fa69c9e74b9 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -8654,7 +8654,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -8660,7 +8660,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch index b9feb59fa1a0b..533ff5bb6e3a9 100644 --- a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch +++ b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch @@ -11,7 +11,7 @@ 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 e424b3d9f19f58668a5cbef14a949454a61f6c24..118afb87445c029c4beeea349b252f6b77e4aa8d 100644 +index ffa768224af4d9ba012581d7facd34d8a03dcfd8..92726aeadd3160661cf10c9e0751d1f5a12fb156 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2215,9 +2215,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index d8155974cbca3..28f878e028c88 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -6,10 +6,10 @@ Subject: frame_host_manager.patch Allows embedder to intercept site instances created by chromium. diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc -index ee5750669e83a5b089a322733d8e9ee600a81f3f..d5f2d5bb7593cade974d9f38e9950a428be9fb3a 100644 +index 7c85f3e5bdee4797da773219404fd9b1bc9f529a..b979d6b567024aa7fc2945e86da8c613a5a19b76 100644 --- a/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc -@@ -4223,6 +4223,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -4219,6 +4219,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } @@ -20,7 +20,7 @@ index ee5750669e83a5b089a322733d8e9ee600a81f3f..d5f2d5bb7593cade974d9f38e9950a42 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 83aa3dd465cb02a3b15852764c00746c205b5b0f..6af3ad96c8cf8a46dc1464b9647d8ec2d3136571 100644 +index 9f69a4daad85f17da49ac49aa2d79fcdd44a5049..bfd546f78d68f80273bf912cf474856d9a622340 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -320,6 +320,11 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch index dc614bebd2bdb..0f8f2addeee5a 100644 --- a/patches/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/chromium/gin_enable_disable_v8_platform.patch @@ -38,10 +38,10 @@ index c19eb72e8d37fe8145b813d07875addf793e12dc..a5db8841773618814ac90f740201d4d7 // Returns whether `Initialize` has already been invoked in the process. // Initialization is a one-way operation (i.e., this method cannot return diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 28b52d6f9a94e63aae4adbe43455e0d2553c77a2..af5eb8ae2efd2544889250537f0014d318aaa2ab 100644 +index 989e00ca31a20ccd5897813b427d8d133d873d0e..7672c5f8f2e7507ddc39f4a2e94646844f7f3121 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc -@@ -447,7 +447,8 @@ void SetFlags(IsolateHolder::ScriptMode mode, +@@ -464,7 +464,8 @@ void SetFlags(IsolateHolder::ScriptMode mode, // static void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, const std::string js_command_line_flags, @@ -51,7 +51,7 @@ index 28b52d6f9a94e63aae4adbe43455e0d2553c77a2..af5eb8ae2efd2544889250537f0014d3 static bool v8_is_initialized = false; if (v8_is_initialized) return; -@@ -457,7 +458,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, +@@ -474,7 +475,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, // See https://crbug.com/v8/11043 SetFlags(mode, js_command_line_flags); diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 5c510f43cda92..20ccb0f9e96ce 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index da65719b0f34fd9acf5f607e30f76cd662326244..5fbce05ab09835a6dd2d2daa49e8a83e162e26d6 100644 +index 98769c240b3569ffcc1f987c6a2a312860aecbbf..7ab4bf1213d1eb18214b9c76eb7d032c561f1888 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -1287,6 +1287,11 @@ +@@ -1291,6 +1291,11 @@ "includes": [8440], }, diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch index ead4912d11a45..b76df5fd74ba6 100644 --- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch +++ b/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 4e01d9d33165d392c1107afdb9e6f5cbb93f5f15..c66e54efd0f6980370649c5fa5dfb99928495f6b 100755 +index bf5dfc3693cab1386aceab981f954c7372d35d58..3fbd1f880eee78f1c8025965d0220ea57c7b3530 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -307,6 +307,8 @@ def GetDefaultHostOs(): diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch index c8f69ad4ea7b5..4849c2d93d330 100644 --- a/patches/chromium/load_v8_snapshot_in_browser_process.patch +++ b/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 f3988a35b1df7b54f58b941847c64ec4ab27cf40..83da453659ed0007d2be4079e1b102245cc27268 100644 +index bf6ea2945dfeaad391f893797a25dd7912c242f7..496cf165cd37711fcb27fe74e4d3b00709941d19 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc @@ -274,11 +274,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) { diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index e99cdc3794693..7a6303f9f1285 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,10 +35,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index e54d9ff43f3ab09e007fea77344482f9884ce404..3d395e8feeeb2f6d0fc460b19235dfdbae00437a 100644 +index 1f40ac55a05561faf727732813004e6a17ff7ad7..d2cb8ac8b6a4b3e3a947a235a802c0b1d5bc6d13 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1032,6 +1032,7 @@ component("base") { +@@ -1034,6 +1034,7 @@ component("base") { "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", @@ -431,7 +431,7 @@ index 14a52ca1254d4b583b44c20336cce1637b91f88c..618b9a6d680a2bfaf26ad3c7303a9508 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 531f2f8f15cb0d052621bc6a4f0a4c3afcb89d19..2cd7d5894206c6fc322918a79562d942984f3e1f 100644 +index 2669b822d242a7a6fd6aec923afe7593f03b7eb7..ec74ae5fa01ca89e048ec2deef7776d3f28058c0 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -53,6 +53,7 @@ source_set("browser") { @@ -580,7 +580,7 @@ index f1dbc483ec57d2a1cc409b9d82448879f84ffeae..1c85063d6df14dafa5a4334046e1eada public_deps = [ ":mojo_bindings", diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn -index 19a85853ced691c017760ebc415d8a78ab5a970b..104fd36fc669db13b4af483f81ef991358df1e8f 100644 +index 8d978ba3c27d6399c1d03b5cb291dab0b5305e0e..026b9d7ff92e09e5cb98723ffc2c8998a34c0787 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -224,6 +224,7 @@ target(link_target_type, "renderer") { @@ -660,7 +660,7 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019 } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index a19857ade673092db3741f1e8f385d418246b580..d523a23793e4f28112af6500eb6ea1043b83516d 100644 +index c970dd6d3ad7d40a919b0dd99c2d5b81652646ab..0a93246100832dac7dd4f32966ef4c80d5c9b6bb 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -474,6 +474,7 @@ static_library("test_support") { @@ -671,7 +671,7 @@ index a19857ade673092db3741f1e8f385d418246b580..d523a23793e4f28112af6500eb6ea104 ] public_deps = [ -@@ -1047,6 +1048,7 @@ static_library("browsertest_support") { +@@ -1049,6 +1050,7 @@ static_library("browsertest_support") { } configs += [ "//v8:external_startup_data" ] @@ -679,7 +679,7 @@ index a19857ade673092db3741f1e8f385d418246b580..d523a23793e4f28112af6500eb6ea104 } mojom("content_test_mojo_bindings") { -@@ -1666,6 +1668,7 @@ test("content_browsertests") { +@@ -1668,6 +1670,7 @@ test("content_browsertests") { defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] configs += [ "//build/config:precompiled_headers" ] @@ -687,7 +687,7 @@ index a19857ade673092db3741f1e8f385d418246b580..d523a23793e4f28112af6500eb6ea104 public_deps = [ ":test_interfaces", -@@ -2906,6 +2909,7 @@ test("content_unittests") { +@@ -2909,6 +2912,7 @@ test("content_unittests") { } configs += [ "//build/config:precompiled_headers" ] @@ -861,7 +861,7 @@ index 6ab4e755d5d7a82685424118c21ded35924c611c..65022e5613c275883b6578662492a9f7 if (is_ios) { diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc -index cb1fda282600555b57b3e135434ceaaeed863a6e..c26ec863c15f9dbe441b05ea74349f19cbcaccec 100644 +index 5800426da595f05e95f914371b2174bdff779ac1..7784d60f801282651cf840d90e7e9bf8dc015b96 100644 --- a/media/audio/mac/audio_low_latency_input_mac.cc +++ b/media/audio/mac/audio_low_latency_input_mac.cc @@ -31,19 +31,23 @@ @@ -889,7 +889,7 @@ index cb1fda282600555b57b3e135434ceaaeed863a6e..c26ec863c15f9dbe441b05ea74349f19 } // namespace diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc -index 7f079995d4161796b7208348c43c39a2569b0fc1..1d8fc87f2c420bb809f4925eaa3902ca89453c13 100644 +index 473162885a2249cbc9b20bd810de95f54f0876f7..2fb15fcb7a04bfff01d7a22e79d467ba946b37d8 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -970,7 +970,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters( @@ -1278,7 +1278,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 c1974a6726285a5311727f026f62f90c1187130f..f050022227720283135e2c3d85c5992f193d7e1e 100644 +index 3475f873f2e8f0b654dfb27df911507575c2645b..8162ffa9ee446312bb16fe66e8ea7e601f3028bc 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -312,6 +312,7 @@ component("core") { diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index cbb5c0c79a533..0745e18fcefbf 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -7,10 +7,10 @@ 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 ae6fef767b000bafcbcaa8637f14813e970fe416..f176d1a7086305a9f06a6dca3c4fc428cdf73d0c 100644 +index 04dbde365bd0585d9a63dc3a696626817257ab64..a17b1a681e7473190c010db528d1ce4b24af876a 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -147,6 +147,11 @@ +@@ -146,6 +146,11 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" @@ -22,7 +22,7 @@ index ae6fef767b000bafcbcaa8637f14813e970fe416..f176d1a7086305a9f06a6dca3c4fc428 #if BUILDFLAG(IS_CT_SUPPORTED) // gn check does not account for BUILDFLAG(). So, for iOS builds, it will // complain about a missing dependency on the target exposing this header. Add a -@@ -427,6 +432,99 @@ bool GetFullDataFilePath( +@@ -426,6 +431,99 @@ bool GetFullDataFilePath( } // namespace @@ -122,7 +122,7 @@ index ae6fef767b000bafcbcaa8637f14813e970fe416..f176d1a7086305a9f06a6dca3c4fc428 constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess; NetworkContext::NetworkContextHttpAuthPreferences:: -@@ -800,6 +898,13 @@ void NetworkContext::SetClient( +@@ -791,6 +889,13 @@ void NetworkContext::SetClient( client_.Bind(std::move(client)); } @@ -136,7 +136,7 @@ index ae6fef767b000bafcbcaa8637f14813e970fe416..f176d1a7086305a9f06a6dca3c4fc428 void NetworkContext::CreateURLLoaderFactory( mojo::PendingReceiver receiver, mojom::URLLoaderFactoryParamsPtr params) { -@@ -2357,6 +2462,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2341,6 +2446,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( std::move(cert_verifier)); cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get()); #endif // BUILDFLAG(IS_CHROMEOS) @@ -147,10 +147,10 @@ index ae6fef767b000bafcbcaa8637f14813e970fe416..f176d1a7086305a9f06a6dca3c4fc428 builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier( diff --git a/services/network/network_context.h b/services/network/network_context.h -index b6ed916515c4c517a84e3a5791de98869b619dbb..fceb8d8a2daae235380fca7a163be001d0c19aa3 100644 +index 5a8232b338453ce3374d51ceebe8a85fc26f2a52..bd06da51ad2106b6a95abb9d773d66ca7d4f8c15 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -114,6 +114,7 @@ class URLMatcher; +@@ -113,6 +113,7 @@ class URLMatcher; namespace network { class CertVerifierWithTrustAnchors; @@ -158,7 +158,7 @@ index b6ed916515c4c517a84e3a5791de98869b619dbb..fceb8d8a2daae235380fca7a163be001 class CookieManager; class HostResolver; class MdnsResponderManager; -@@ -247,6 +248,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -246,6 +247,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext void CreateURLLoaderFactory( mojo::PendingReceiver receiver, mojom::URLLoaderFactoryParamsPtr params) override; @@ -167,7 +167,7 @@ index b6ed916515c4c517a84e3a5791de98869b619dbb..fceb8d8a2daae235380fca7a163be001 void ResetURLLoaderFactories() override; void GetViaObliviousHttp( mojom::ObliviousHttpRequestPtr request, -@@ -894,6 +897,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -887,6 +890,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext std::vector dismount_closures_; #endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED) @@ -177,7 +177,7 @@ index b6ed916515c4c517a84e3a5791de98869b619dbb..fceb8d8a2daae235380fca7a163be001 std::unique_ptr internal_host_resolver_; // Map values set to non-null only if that HostResolver has its own private diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index cfbd006fedddd94f645e484ece83a6a39383067b..a9212c8c51ce96c4313dfc8f955be737f5917079 100644 +index 4844780c61f5010afac7006917970fdad952371f..7309c263eb58a21129427c8fbb47feb2ef8f1c77 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -310,6 +310,16 @@ struct SocketBrokerRemotes { @@ -208,7 +208,7 @@ index cfbd006fedddd94f645e484ece83a6a39383067b..a9212c8c51ce96c4313dfc8f955be737 CreateURLLoaderFactory(pending_receiver url_loader_factory, URLLoaderFactoryParams params); diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h -index 3900cd0343d29f7d4d03a9d634639d0c37ecfb18..7bf8209052544647721535a331825286fee478dc 100644 +index 23694108d7d81ac70085513ef32f569f89564682..be94ed854cb5cf9e165e7e83a2e8cd3d3ab498cd 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 { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index e561796207c41..65160207f96b9 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -7,7 +7,7 @@ Pass RenderFrameHost through to PlatformNotificationService so Electron can identify which renderer a notification came from. diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc -index 8ba0cc2afe6a8bcabecee8f081d0ffd75ae71594..584f008f3e5dc9f6e16f18359773f5c8e53d96cd 100644 +index 89534cf6d7ec55c4d422a88531543285f72ec309..a51115e4195f469beb8f38a0a682b828b8b113c0 100644 --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc @@ -198,6 +198,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically( @@ -133,7 +133,7 @@ index 1dc5478b8d0787a1cc82dc9fcb0227fed3f583c2..9a76f675ccdd4b173afa65aa05b733d4 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 0ef4f3f740102cfefdb8e2a87be0044fd88746d0..412887e0002a5bc65be1f5ecbed9e991972d373a 100644 +index d010f57377a35e5804ff95767284de1a702da0b1..30ad86a1f570b92a46221f572320696b4f17a764 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2035,7 +2035,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index eef0e3165e735..70cbea5854799 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -829,10 +829,10 @@ index 3cf735c0bf3ba4ed4a871f4608f43cf9767de62f..fccabc0c51ba2fc1ccd8646d30da782f // Calculate number of pages in source document. uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame, diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 2cd7d5894206c6fc322918a79562d942984f3e1f..2a7cfcd58812bdf2dcede44a9ba37bd8446407fe 100644 +index ec74ae5fa01ca89e048ec2deef7776d3f28058c0..d4fa8d145d6da8b14b0782266dc5fde1a114f532 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2981,8 +2981,9 @@ source_set("browser") { +@@ -2987,8 +2987,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index e4824e5c6793f..c24ff5339fe39 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,7 +30,7 @@ index c4255d8dfc2e3c4f1f32506e4e9edbb90a74340a..142398a8adafc94e6724ee750b612a66 // 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 4b9f416e501a1c5af64e9e716a0ce47cfc32af1c..e424b3d9f19f58668a5cbef14a949454a61f6c24 100644 +index 28ad2c8655d8c1d7797af01aca30223e767bffad..ffa768224af4d9ba012581d7facd34d8a03dcfd8 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2141,6 +2141,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { @@ -44,10 +44,10 @@ index 4b9f416e501a1c5af64e9e716a0ce47cfc32af1c..e424b3d9f19f58668a5cbef14a949454 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 213cfa19ecd8f831107e1e6cff5c38480f3715a7..b057b66c99a7f91b40b803f51e9b1c225e4bba4a 100644 +index 3e2bd94628cdfadc07aeb6a570a4bbe6c0432865..b105731ae674c17a2200a1407ddc7c0c0d079481 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5102,6 +5102,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -5108,6 +5108,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 064f541eab78b..03284d1546a46 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,7 +52,7 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index e7fd49020f3fcf55980d4f2a4df38c73aaf32929..4b4545013d6de396a660b234ded3f16f8bb0e983 100644 +index 91c29a96d2d97dfe916e29c14a3daa154b02f97c..3611378c052813bd9c9ab9ce7d1840d6535576bf 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -1602,7 +1602,7 @@ if (is_chrome_branded && !is_android) { diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index a92b58385eebb..1573b2d54e906 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/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 c4251ab6da2535d9fd2062c5553e7f9178887a63..6ace03b7f021605f8686882732870341995e86ed 100644 +index 1cfc75e09957393ea32a4b800893fd4cf53f5e62..57805246ec1c8401fe3582f582ff14cc2bb6380e 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1219,7 +1219,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { +@@ -1220,7 +1220,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 4c9e001f88843..2aafe35e4f52c 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/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 412887e0002a5bc65be1f5ecbed9e991972d373a..82b4a00f9c66627ef897c717a0f2e93ac0f13e08 100644 +index 30ad86a1f570b92a46221f572320696b4f17a764..0fa0effecebf1437181c02e477762ef4f33e9aaf 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1712,9 +1712,15 @@ bool RenderProcessHostImpl::Init() { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 891bf0a26467a..f7072ee9386da 100644 --- a/patches/chromium/web_contents.patch +++ b/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 81c2ea6d3266068593388211043c670bbdffe006..0170f7609c30f3e3b858af77703e95d1c1722738 100644 +index f613979626d88506c28e66a48165d9efc1f0f63c..fdcf69670caae0622f9f641e59ac735ee7504bad 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3450,6 +3450,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3451,6 +3451,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 81c2ea6d3266068593388211043c670bbdffe006..0170f7609c30f3e3b858af77703e95d1 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3460,6 +3467,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3461,6 +3468,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index c3565e9543e2b..947298b6d45d8 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/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 429f9e77be832297448bdcd020b7878d3c07703f..976d957ddec2a3490fb20e302c49a1a08477d92a 100644 +index 3cd17df056104948ea7ea373f25129a276c8d288..f9bfc58138a2c6ce05c71cf279112a79767b9cbf 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -7451,6 +7451,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -7442,6 +7442,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } @@ -37,10 +37,10 @@ index 429f9e77be832297448bdcd020b7878d3c07703f..976d957ddec2a3490fb20e302c49a1a0 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 0170f7609c30f3e3b858af77703e95d1c1722738..b12ee61f31aa591011e575772546e5149dc697fc 100644 +index fdcf69670caae0622f9f641e59ac735ee7504bad..e7778ffef3c737d69af2713820027776f4119a64 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3704,21 +3704,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -3705,21 +3705,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index 0170f7609c30f3e3b858af77703e95d1c1722738..b12ee61f31aa591011e575772546e514 } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -3854,7 +3858,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -3855,7 +3859,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame, options)); DCHECK(requesting_frame->IsActive()); diff --git a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch index 476286ff16246..cb4d63aab5100 100644 --- a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch +++ b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch @@ -46,10 +46,10 @@ index 6cdf53b19c7d058bb66b9fcbe745874cc48daa99..8d112008c2667db97ed5b5af3f87c40d V8_INLINE static void* GetAlignedPointerFromInternalField( const BasicTracedReference& object, int index) { diff --git a/src/api/api.cc b/src/api/api.cc -index d75a110a0b5b639c3d01538930c984b7e2129e2a..46527ae2abecb951a0604a60ab17553794603fb2 100644 +index 851e9051455d42178608d7b86687b8e0e62f0bbe..9b5e8844224dcef10f1b8c349285b856507a666b 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -6292,14 +6292,33 @@ Local v8::Object::SlowGetInternalField(int index) { +@@ -6283,14 +6283,33 @@ Local v8::Object::SlowGetInternalField(int index) { isolate); } From 03fc015a27f4245ba13244dcbf7d7f87becf29f2 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 10:46:59 +0100 Subject: [PATCH 04/27] 5139789: Deduplicate BrowserContext's ResourceContext https://chromium-review.googlesource.com/c/chromium/src/+/5139789 --- shell/browser/electron_browser_context.cc | 9 --------- shell/browser/electron_browser_context.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc index 88e937a696f5e..d217840da191a 100644 --- a/shell/browser/electron_browser_context.cc +++ b/shell/browser/electron_browser_context.cc @@ -269,9 +269,6 @@ ElectronBrowserContext::~ElectronBrowserContext() { BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( this); ShutdownStoragePartitions(); - - BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, - std::move(resource_context_)); } void ElectronBrowserContext::InitPrefs() { @@ -365,12 +362,6 @@ int ElectronBrowserContext::GetMaxCacheSize() const { return max_cache_size_; } -content::ResourceContext* ElectronBrowserContext::GetResourceContext() { - if (!resource_context_) - resource_context_ = std::make_unique(); - return resource_context_.get(); -} - std::string ElectronBrowserContext::GetMediaDeviceIDSalt() { if (!media_device_id_salt_.get()) media_device_id_salt_ = std::make_unique(prefs_.get()); diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h index 80581f2d3f540..5475541d5ec08 100644 --- a/shell/browser/electron_browser_context.h +++ b/shell/browser/electron_browser_context.h @@ -146,7 +146,6 @@ class ElectronBrowserContext : public content::BrowserContext { // content::BrowserContext: base::FilePath GetPath() override; bool IsOffTheRecord() override; - content::ResourceContext* GetResourceContext() override; std::unique_ptr CreateZoomLevelDelegate( const base::FilePath& partition_path) override; content::PushMessagingService* GetPushMessagingService() override; @@ -241,7 +240,6 @@ class ElectronBrowserContext : public content::BrowserContext { blink::PermissionType permission_type); scoped_refptr in_memory_pref_store_; - std::unique_ptr resource_context_; std::unique_ptr cookie_change_notifier_; std::unique_ptr prefs_; std::unique_ptr download_manager_delegate_; From dbed55ed68a397f042a2cf77c4e796e0c672b710 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 11:02:52 +0100 Subject: [PATCH 05/27] 5148579: Simplify SelectFileDialog::Listener https://chromium-review.googlesource.com/c/chromium/src/+/5148579 --- shell/browser/file_select_helper.cc | 20 ++------------------ shell/browser/file_select_helper.h | 10 ++-------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc index b1932e9b2dc33..7798be96778d4 100644 --- a/shell/browser/file_select_helper.cc +++ b/shell/browser/file_select_helper.cc @@ -77,16 +77,9 @@ FileSelectHelper::~FileSelectHelper() { select_file_dialog_->ListenerDestroyed(); } -void FileSelectHelper::FileSelected(const base::FilePath& path, +void FileSelectHelper::FileSelected(const ui::SelectedFileInfo& file, int index, void* params) { - FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params); -} - -void FileSelectHelper::FileSelectedWithExtraInfo( - const ui::SelectedFileInfo& file, - int index, - void* params) { if (!render_frame_host_) { RunFileChooserEnd(); return; @@ -101,19 +94,10 @@ void FileSelectHelper::FileSelectedWithExtraInfo( std::vector files; files.push_back(file); - MultiFilesSelectedWithExtraInfo(files, params); + MultiFilesSelected(files, params); } void FileSelectHelper::MultiFilesSelected( - const std::vector& files, - void* params) { - std::vector selected_files = - ui::FilePathListToSelectedFileInfoList(files); - - MultiFilesSelectedWithExtraInfo(selected_files, params); -} - -void FileSelectHelper::MultiFilesSelectedWithExtraInfo( const std::vector& files, void* params) { #if BUILDFLAG(IS_MAC) diff --git a/shell/browser/file_select_helper.h b/shell/browser/file_select_helper.h index f71d3f8979ea5..27a2dbb0b20a6 100644 --- a/shell/browser/file_select_helper.h +++ b/shell/browser/file_select_helper.h @@ -84,17 +84,11 @@ class FileSelectHelper : public base::RefCountedThreadSafe< void RunFileChooserEnd(); // SelectFileDialog::Listener overrides. - void FileSelected(const base::FilePath& path, + void FileSelected(const ui::SelectedFileInfo& file, int index, void* params) override; - void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file, - int index, - void* params) override; - void MultiFilesSelected(const std::vector& files, + void MultiFilesSelected(const std::vector& files, void* params) override; - void MultiFilesSelectedWithExtraInfo( - const std::vector& files, - void* params) override; void FileSelectionCanceled(void* params) override; // content::WebContentsObserver overrides. From eeb21b1357ce55de25139ddf64e4b1c5f735bbb8 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 11:03:08 +0100 Subject: [PATCH 06/27] 5134038: Code Health: Use string_view in base::i18n::BreakIterator::SetText https://chromium-review.googlesource.com/c/chromium/src/+/5134038 --- shell/renderer/api/electron_api_spell_check_client.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc index 4103b5214bb20..79bcc8044be70 100644 --- a/shell/renderer/api/electron_api_spell_check_client.cc +++ b/shell/renderer/api/electron_api_spell_check_client.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -147,7 +148,7 @@ void SpellCheckClient::SpellCheckText() { return; } - text_iterator_.SetText(text.c_str(), text.size()); + text_iterator_.SetText(text); SpellCheckScope scope(*this); std::u16string word; @@ -245,7 +246,7 @@ bool SpellCheckClient::IsContraction( std::vector* contraction_words) { DCHECK(contraction_iterator_.IsInitialized()); - contraction_iterator_.SetText(contraction.c_str(), contraction.length()); + contraction_iterator_.SetText(contraction); std::u16string word; size_t word_start; From 473986b1456ba8d5df32a24e0bbce902813c8886 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 11:04:35 +0100 Subject: [PATCH 07/27] 5137427: Code Health: Use string_view in SpellCheck::SpellCheckWord https://chromium-review.googlesource.com/c/chromium/src/+/5137427 --- shell/renderer/api/electron_api_web_frame.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc index bbd5e8ef11fd6..7a09f4b297de7 100644 --- a/shell/renderer/api/electron_api_web_frame.cc +++ b/shell/renderer/api/electron_api_web_frame.cc @@ -116,9 +116,8 @@ bool SpellCheckWord(content::RenderFrame* render_frame, return false; std::u16string w = base::UTF8ToUTF16(word); - return client->GetSpellCheck()->SpellCheckWord(w.c_str(), 0, word.size(), - *spellcheck_host.get(), &start, - &length, optional_suggestions); + return client->GetSpellCheck()->SpellCheckWord( + w, *spellcheck_host.get(), &start, &length, optional_suggestions); } #endif From 38d63bee8095434796f3d679d95fdcd6bdce2145 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 13:31:43 +0100 Subject: [PATCH 08/27] [libcxx] adds ranges::fold_left_with_iter and ranges::fold_left Notable things in this commit: * refactors `__indirect_binary_left_foldable`, making it slightly different (but equivalent) to _`indirect-binary-left-foldable`_, which improves readability (a [patch to the Working Paper][patch] was made) * omits `__cpo` namespace, since it is not required for implementing niebloids (a cleanup should happen in 2024) * puts tests ensuring invocable robustness and dangling correctness inside the correctness testing to ensure that the algorithms' results are still correct [patch]: https://github.com/cplusplus/draft/pull/6734 --- filenames.libcxx.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filenames.libcxx.gni b/filenames.libcxx.gni index 179fa4fbb846b..0a7308a4e8816 100644 --- a/filenames.libcxx.gni +++ b/filenames.libcxx.gni @@ -24,6 +24,7 @@ libcxx_headers = [ "//third_party/libc++/src/include/__algorithm/find_if.h", "//third_party/libc++/src/include/__algorithm/find_if_not.h", "//third_party/libc++/src/include/__algorithm/find_segment_if.h", + "//third_party/libc++/src/include/__algorithm/fold.h", "//third_party/libc++/src/include/__algorithm/for_each.h", "//third_party/libc++/src/include/__algorithm/for_each_n.h", "//third_party/libc++/src/include/__algorithm/for_each_segment.h", @@ -109,6 +110,7 @@ libcxx_headers = [ "//third_party/libc++/src/include/__algorithm/ranges_any_of.h", "//third_party/libc++/src/include/__algorithm/ranges_binary_search.h", "//third_party/libc++/src/include/__algorithm/ranges_clamp.h", + "//third_party/libc++/src/include/__algorithm/ranges_contains.h", "//third_party/libc++/src/include/__algorithm/ranges_copy.h", "//third_party/libc++/src/include/__algorithm/ranges_copy_backward.h", "//third_party/libc++/src/include/__algorithm/ranges_copy_if.h", @@ -914,10 +916,8 @@ libcxx_headers = [ "//third_party/libc++/src/include/expected", "//third_party/libc++/src/include/experimental/__config", "//third_party/libc++/src/include/experimental/__memory", - "//third_party/libc++/src/include/experimental/__simd/abi_tag.h", "//third_party/libc++/src/include/experimental/__simd/aligned_tag.h", "//third_party/libc++/src/include/experimental/__simd/declaration.h", - "//third_party/libc++/src/include/experimental/__simd/internal_declaration.h", "//third_party/libc++/src/include/experimental/__simd/reference.h", "//third_party/libc++/src/include/experimental/__simd/scalar.h", "//third_party/libc++/src/include/experimental/__simd/simd.h", From 4e137170fe9b5db06b91231b8f37b1b00f0c7325 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:00:23 +0000 Subject: [PATCH 09/27] chore: bump chromium in DEPS to 122.0.6224.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f963395c6a816..fb36a81f5b429 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6223.0', + '122.0.6224.0', 'node_version': 'v20.10.0', 'nan_version': From e67167494e6d88099241f5c27dc303282cb557eb Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 20:59:36 +0100 Subject: [PATCH 10/27] 5154766: [Refresh 2023] [GTK] Fix gap above toolbar with fractional scaling https://chromium-review.googlesource.com/c/chromium/src/+/5154766 --- ...ized_parameter_to_linuxui_getwindowframeprovider.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch index c17dd1b532324..a866370836825 100644 --- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch +++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch @@ -123,7 +123,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc WindowFrameProviderGtk::~WindowFrameProviderGtk() = default; @@ -329,7 +332,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( - top_area_height_dip * scale - effective_frame_thickness_px.top(); + const int top_area_height_px = top_area_bottom_px - client_bounds_px.y(); auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px}, - HeaderContext(solid_frame_, focused), scale); @@ -140,10 +140,10 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context)); frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context)); gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset)); -@@ -370,7 +373,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { - PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale); +@@ -371,7 +371,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { + focused_context, scale); asset.unfocused_bitmap = - PaintBitmap(bitmap_size, frame_bounds_dip, + PaintBitmap(bitmap_size, gfx::RectF(frame_bounds_dip), - DecorationContext(solid_frame_, false), scale); + DecorationContext(solid_frame_, maximized_, false), scale); From 49c999ed45760036fadcf2e94794807efdc0c3e3 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 21:03:02 +0100 Subject: [PATCH 11/27] chore: fixup patch indices --- ...er_to_linuxui_getwindowframeprovider.patch | 14 ++++++------ ..._scheduler_throttling_per_renderview.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 14 ++++++------ patches/chromium/can_create_window.patch | 22 +++++++++---------- ...screationoverridden_with_full_params.patch | 12 +++++----- ...e_browser_v8_snapshot_file_name_fuse.patch | 6 ++--- .../disable_color_correct_rendering.patch | 2 +- patches/chromium/disable_hidden.patch | 4 ++-- ...ding_non-standard_schemes_in_iframes.patch | 6 ++--- ...board_hides_on_input_blur_in_webview.patch | 4 ++-- ...original_resize_performance_on_macos.patch | 2 +- ...t_menu_item_when_opened_via_keyboard.patch | 2 +- patches/chromium/frame_host_manager.patch | 2 +- .../gin_enable_disable_v8_platform.patch | 6 ++--- ..._avoid_private_macos_api_usage.patch.patch | 10 ++++----- patches/chromium/printing.patch | 4 ++-- ...r_changes_to_the_webcontentsobserver.patch | 10 ++++----- patches/chromium/web_contents.patch | 12 +++++----- patches/chromium/webview_fullscreen.patch | 10 ++++----- 19 files changed, 72 insertions(+), 72 deletions(-) diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch index a866370836825..dcc70b7fdcfb7 100644 --- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch +++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch @@ -53,10 +53,10 @@ index 38c1297588f30cc81d48cfd2321845815bb93ea5..0f4141d2146c38f054b060ddfa06a9f6 // Objects to notify when the window frame button order changes. base::ObserverList::Unchecked diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc -index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc9dec6800 100644 +index a739dbab82f4b5b221f27364ccaa5daf2161a059..e2c47d50b64c2e994b3e63a3fc671504ce928964 100644 --- a/ui/gtk/window_frame_provider_gtk.cc +++ b/ui/gtk/window_frame_provider_gtk.cc -@@ -40,17 +40,20 @@ std::string GetThemeName() { +@@ -41,17 +41,20 @@ std::string GetThemeName() { return theme_string; } @@ -80,7 +80,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc // GTK4 renders the decoration directly on the window. if (!GtkCheckVersion(4)) { context = AppendCssNodeToStyleContext(context, "decoration"); -@@ -69,8 +72,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) { +@@ -70,8 +73,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) { return context; } @@ -91,7 +91,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc context = AppendCssNodeToStyleContext(context, "headerbar.header-bar.titlebar"); if (!focused) { -@@ -129,8 +132,8 @@ int ComputeTopCornerRadius() { +@@ -128,8 +131,8 @@ int ComputeTopCornerRadius() { // need to experimentally determine the corner radius by rendering a sample. // Additionally, in GTK4, the headerbar corners get clipped by the window // rather than the headerbar having its own rounded corners. @@ -122,7 +122,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc WindowFrameProviderGtk::~WindowFrameProviderGtk() = default; -@@ -329,7 +332,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( +@@ -330,7 +333,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( const int top_area_height_px = top_area_bottom_px - client_bounds_px.y(); auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px}, @@ -131,7 +131,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc image = gfx::ImageSkia::CreateFrom1xBitmap(header); // In GTK4, the headerbar gets clipped by the window. if (GtkCheckVersion(4)) { -@@ -362,7 +365,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { +@@ -363,7 +366,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip, 2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip); @@ -140,7 +140,7 @@ index d3d9b34851a90716facd75208313133460461d5a..29dbb9b592103991ed15653f7a4b72bc frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context)); frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context)); gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset)); -@@ -371,7 +371,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { +@@ -371,7 +374,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { focused_context, scale); asset.unfocused_bitmap = PaintBitmap(bitmap_size, gfx::RectF(frame_bounds_dip), diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index 4c61ecfb49fa9..ff85a23d5595c 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -23,7 +23,7 @@ index ed1cd91f4ec979f5a194a110ce9fc6ae3459cd09..812534c3834094f762b81daea204c85e return receiver_.BindNewEndpointAndPassDedicatedRemote(); } diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index 14cddd19bc4cb2be3fbffc077907a11668c54f1c..2222b3ff14b06c7515133c6bf8443baeeb201f66 100644 +index dc10b3766c512a60a454194b5a11906eeb73e47e..de4506f124bce0e7094a1c10945a9c6508c32b2a 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -713,6 +713,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index d76acafeabe23..7fd217edc9f95 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -33,10 +33,10 @@ index 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449f "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 225f9e9010ef911355e23b1e31e3e298550b1068..4ece05ccf4c0728bca2d4a88468642211b551f4d 100644 +index 516f8d3bc275f7b3ae30b9058b9859ee95ba838f..e0cf50648db41b1ab38ac9801446fc303fcc7c0d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4746,7 +4746,7 @@ static_library("browser") { +@@ -4740,7 +4740,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 225f9e9010ef911355e23b1e31e3e298550b1068..4ece05ccf4c0728bca2d4a8846864221 sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 0c5f06e5a0990fb0ff6e37a101c5dbc93f00b252..b3ef1882018d21b9bc978a36be2976aa864eb9a0 100644 +index bf022c0f8cec66a5f273346a75eb49f0b03b463c..8f4156b043a6d8d88bbe39926b3feffdc0f61e11 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7185,7 +7185,6 @@ if (!is_fuchsia) { +@@ -7191,7 +7191,6 @@ if (!is_fuchsia) { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index 0c5f06e5a0990fb0ff6e37a101c5dbc93f00b252..b3ef1882018d21b9bc978a36be2976aa "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -7206,6 +7205,10 @@ if (!is_fuchsia) { +@@ -7212,6 +7211,10 @@ if (!is_fuchsia) { "//ui/resources", ] @@ -68,7 +68,7 @@ index 0c5f06e5a0990fb0ff6e37a101c5dbc93f00b252..b3ef1882018d21b9bc978a36be2976aa ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -8227,7 +8230,6 @@ if (!is_fuchsia) { +@@ -8231,7 +8234,6 @@ if (!is_fuchsia) { } deps += [ @@ -76,7 +76,7 @@ index 0c5f06e5a0990fb0ff6e37a101c5dbc93f00b252..b3ef1882018d21b9bc978a36be2976aa "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter", -@@ -8320,6 +8322,10 @@ if (!is_fuchsia) { +@@ -8324,6 +8326,10 @@ if (!is_fuchsia) { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index fa242ce0fd857..8b7365fee1590 100644 --- a/patches/chromium/can_create_window.patch +++ b/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 ae5a97f5e0961cc0116b5be337e4a6c484703dea..3cd17df056104948ea7ea373f25129a276c8d288 100644 +index 2b61af0a7453bced2fc476ca835f8924304a90d6..b16b3aabb38b5d992de01d5a6d0ab713fc175fd8 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8250,6 +8250,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -8243,6 +8243,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index ae5a97f5e0961cc0116b5be337e4a6c484703dea..3cd17df056104948ea7ea373f25129a2 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index d425d19cecbb4a25bbec27c9236244c25d449aae..3e2bd94628cdfadc07aeb6a570a4bbe6c0432865 100644 +index 1eb685859edce97ca0d45702aaf5cf0effa3c190..0140932cdaf89e22afc82360d279e64d17fd7571 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4496,6 +4496,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4511,6 +4511,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( auto* new_contents_impl = new_contents.get(); @@ -37,7 +37,7 @@ index d425d19cecbb4a25bbec27c9236244c25d449aae..3e2bd94628cdfadc07aeb6a570a4bbe6 // 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 -@@ -4537,12 +4543,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4552,12 +4558,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -66,7 +66,7 @@ index ecdc75ae7888096922fb1ae1c86e9b80595d6570..feb8f08b44568f2c09359c8f3ec343fd // 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 1c5717272933f75d789d9b727402d2c2cf13cbb0..56d476fa09a1648451b9f0e14c298024160f3da2 100644 +index ab03f01748f9784c2b4831476b3c9af79b8718e3..4f2cbca4fad52ba7d7d68b8e57e7a366d9573369 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -725,6 +725,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -79,7 +79,7 @@ index 1c5717272933f75d789d9b727402d2c2cf13cbb0..56d476fa09a1648451b9f0e14c298024 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 2549daafcb3c39642015efa0538fb4ace29756c9..9f69a4daad85f17da49ac49aa2d79fcdd44a5049 100644 +index ae2bcf19f154d08f655bc8e3f6393bd137fd921d..e176f11b94790d3dd92e8a2138f3fd21f4b13910 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -181,6 +181,7 @@ class NetworkService; @@ -163,10 +163,10 @@ index 2f0ea25dab58f9750749f8c25b3acd60ec2c655e..760adefe3056e628a551218526529cca // moved on send. bool is_background_tab = diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc -index 51de81df6cb5126a750dab43322f8fc1fc484d80..9cb924a1969eef8d3940cc261e286e10c6d84d5c 100644 +index ec5ad5ca26d2126cfcd80d764b7c1dff5c2d4543..337ba3710c757cf42af7869fef6faa3ae8473610 100644 --- a/content/web_test/browser/web_test_content_browser_client.cc +++ b/content/web_test/browser/web_test_content_browser_client.cc -@@ -512,6 +512,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -507,6 +507,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -176,10 +176,10 @@ index 51de81df6cb5126a750dab43322f8fc1fc484d80..9cb924a1969eef8d3940cc261e286e10 bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h -index 4869a7502ed31ad6101bd89f899325ffef427c0e..954037dc4fdc21b922debb7a123f1e93e788a908 100644 +index 1f8bcc18bbc249522c790439e004f5706a5ae84c..a6658fd65ef553c84d5f7ee04991cfeac36709c3 100644 --- a/content/web_test/browser/web_test_content_browser_client.h +++ b/content/web_test/browser/web_test_content_browser_client.h -@@ -86,6 +86,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { +@@ -85,6 +85,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index d1e5aaac2dea4..488838f612428 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -80,10 +80,10 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685 } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index d611c512dfe0307a99b0fdaec23a2f3dbbb9d905..b5f1a098471cd726117b3dde146444d6d186fae1 100644 +index 018602d17271ca421188098326ad6090a219ac2a..af6dd489b2d85fbb7d5a53a1059ec80992de7849 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -1884,12 +1884,11 @@ bool Browser::IsWebContentsCreationOverridden( +@@ -1890,12 +1890,11 @@ bool Browser::IsWebContentsCreationOverridden( content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, @@ -99,10 +99,10 @@ index d611c512dfe0307a99b0fdaec23a2f3dbbb9d905..b5f1a098471cd726117b3dde146444d6 WebContents* Browser::CreateCustomWebContents( diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 626a509aa34e6ec5f2ed30b4f9e6d4144f723134..956d1094180f2af239d32c3226fcd43b1826dd3d 100644 +index 12a7f47ed24e8ceaa40ee3684b3fb8334481908b..e712e7471b04d1e7f2f70332fbe540134b2e94a9 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -890,8 +890,7 @@ class Browser : public TabStripModelObserver, +@@ -908,8 +908,7 @@ class Browser : public TabStripModelObserver, content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, @@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b105731ae674c17a2200a1407ddc7c0c0d079481..f613979626d88506c28e66a48165d9efc1f0f63c 100644 +index 23dc228f0d8960de981b618e17cf557d8531028f..27558a8da6a6fb8c8db636b1d0c3ad67b5016ae3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4402,8 +4402,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4417,8 +4417,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, diff --git a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch index 5bbb1121be862..aa95e48cf0141 100644 --- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch +++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch @@ -102,10 +102,10 @@ index c891c5649a6ae76c9f0f988359649ece0e8ac1d9..54e30c4dd82042c283e36cae767dcdd7 friend class ContentClientCreator; friend class ContentClientInitializer; diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 7672c5f8f2e7507ddc39f4a2e94646844f7f3121..cc8c9d3be947914c1c600ec23cac49404e973bac 100644 +index 7dca3d0f45b63a270e6705180ffac4a05430f5ec..4bb4848178554033afd8cf6591d14775c33b2fde 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc -@@ -576,8 +576,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, +@@ -555,8 +555,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out, #if defined(V8_USE_EXTERNAL_STARTUP_DATA) @@ -115,7 +115,7 @@ index 7672c5f8f2e7507ddc39f4a2e94646844f7f3121..cc8c9d3be947914c1c600ec23cac4940 if (g_mapped_snapshot) { // TODO(crbug.com/802962): Confirm not loading different type of snapshot // files in a process. -@@ -586,10 +585,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { +@@ -565,10 +564,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) { base::MemoryMappedFile::Region file_region; base::File file = diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 05ab69821bf82..bbb5068b922b4 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index cb9d275b54d95d2df68b481ed7ce73b9e4aa83b2..e6fb1db611d5314176ddbc909cfbf25965a45dca 100644 +index 539a44d96aecc9bd1b42c4409cdbeaa2b523822a..062c9432fa38ae1cd1d2f4e6baf6f41c109cd220 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1891,6 +1891,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 60c3fe8840a7d..0727d47ef7c93 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ 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 47e2208da837f454d3bd6aa7cdcabe6249fe6859..28ad2c8655d8c1d7797af01aca30223e767bffad 100644 +index 5e850dda31f4780a11964b1feb4f5aff63e10da2..f3955c5e0c491df9cf4d42ca8908e6986256e7cf 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -832,6 +832,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -20,7 +20,7 @@ index 47e2208da837f454d3bd6aa7cdcabe6249fe6859..28ad2c8655d8c1d7797af01aca30223e 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 9bcff210b9ae9922f30b5c38051beba6dfda8aac..74578e01c03cad64f87809f69a4a63c27bd08d10 100644 +index 2c8dfa25d5a02a48add86fc0fde9b8bd433bb165..44a5d8d20e7885fb249377cd3fe3c5e0bee24266 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -914,6 +914,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 814d8cf5bcb09..949c26be90616 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/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 066a0223ec5fdc7e91ea24288e647cfbb6728a26..3afb8dd39b4063bd2f702d45941403a42e4e2aab 100644 +index 2e5436d271df7df7e8f5fc8efbc85cc77bff9a36..a9365d7cf288fa16651ab6a2165803ec7f1078b4 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -10049,6 +10049,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { +@@ -10040,6 +10040,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() { return std::make_pair(parent->GetLastCommittedOrigin(), "about_srcdoc"); } @@ -40,7 +40,7 @@ index 066a0223ec5fdc7e91ea24288e647cfbb6728a26..3afb8dd39b4063bd2f702d45941403a4 // 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 908da65eeef8e6428538def88731c16967e05027..3d09c647bbcabe11b8ecb5b9d508a4d939e6acf4 100644 +index 04fa9442702437258e0de5a3a6910c9b2295d083..7fbb20f0e8e4f34d1fb6e112002fd29466af5c34 100644 --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc @@ -2125,6 +2125,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index bb392c755962e..fc5042f32ab2a 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -45,10 +45,10 @@ index e340087e3ab2f07937ed6e6bd8e0ec8aa2a76d48..2b29e246b2f6ecf5d7605abfa3602864 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index e7778ffef3c737d69af2713820027776f4119a64..af8013e028353360dae1d892ed507fa69c9e74b9 100644 +index 82963e49fdccf50881ff031dcde89926ce650d4e..f443d784d9477562e41d72d421e4a3c03dca63f7 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -8660,7 +8660,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -8690,7 +8690,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch index 533ff5bb6e3a9..7d6199eab3012 100644 --- a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch +++ b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch @@ -11,7 +11,7 @@ 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 ffa768224af4d9ba012581d7facd34d8a03dcfd8..92726aeadd3160661cf10c9e0751d1f5a12fb156 100644 +index ff3d1d4b581512b01bfb82be4c4fc567b2fe636f..cf7fcafe8d1d5cb6307d3488eed267a52e5667c6 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2215,9 +2215,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { diff --git a/patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch b/patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch index 90e575e082b2e..248ad5d021a80 100644 --- a/patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch +++ b/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 683a91b47b02d31a67f2aa33bc011277f3477460..84781c4e14a35e2c477c923c0921f7a96bf77b88 100644 +index df0d88908371c960b9d29edc38c39dc88b0a7c5d..59e40bc7b37b75e6de998e95fde3bdc0690ede05 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -566,6 +566,7 @@ void MenuController::Run(Widget* parent, diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 28f878e028c88..f06a6622c8d85 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,7 +20,7 @@ index 7c85f3e5bdee4797da773219404fd9b1bc9f529a..b979d6b567024aa7fc2945e86da8c613 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 9f69a4daad85f17da49ac49aa2d79fcdd44a5049..bfd546f78d68f80273bf912cf474856d9a622340 100644 +index e176f11b94790d3dd92e8a2138f3fd21f4b13910..69eb12bf5a22298c01bc6cbfb9773088d6313458 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -320,6 +320,11 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch index 0f8f2addeee5a..fd6afa6ff3b29 100644 --- a/patches/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/chromium/gin_enable_disable_v8_platform.patch @@ -38,10 +38,10 @@ index c19eb72e8d37fe8145b813d07875addf793e12dc..a5db8841773618814ac90f740201d4d7 // Returns whether `Initialize` has already been invoked in the process. // Initialization is a one-way operation (i.e., this method cannot return diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 989e00ca31a20ccd5897813b427d8d133d873d0e..7672c5f8f2e7507ddc39f4a2e94646844f7f3121 100644 +index b3647cb580bfa3ba7678511072f18a8d53cd0a6a..7dca3d0f45b63a270e6705180ffac4a05430f5ec 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc -@@ -464,7 +464,8 @@ void SetFlags(IsolateHolder::ScriptMode mode, +@@ -443,7 +443,8 @@ void SetFlags(IsolateHolder::ScriptMode mode, // static void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, const std::string js_command_line_flags, @@ -51,7 +51,7 @@ index 989e00ca31a20ccd5897813b427d8d133d873d0e..7672c5f8f2e7507ddc39f4a2e9464684 static bool v8_is_initialized = false; if (v8_is_initialized) return; -@@ -474,7 +475,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, +@@ -453,7 +454,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode, // See https://crbug.com/v8/11043 SetFlags(mode, js_command_line_flags); diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 7a6303f9f1285..16655581fc94d 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/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 1f40ac55a05561faf727732813004e6a17ff7ad7..d2cb8ac8b6a4b3e3a947a235a802c0b1d5bc6d13 100644 +index ee7e9dd96052fab076e2675ec07e8061662321f7..e2519929397c31c7449691c02673dd9a7f7ac8c9 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1034,6 +1034,7 @@ component("base") { @@ -431,7 +431,7 @@ index 14a52ca1254d4b583b44c20336cce1637b91f88c..618b9a6d680a2bfaf26ad3c7303a9508 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 2669b822d242a7a6fd6aec923afe7593f03b7eb7..ec74ae5fa01ca89e048ec2deef7776d3f28058c0 100644 +index 768c5b2e30e725268f8e4154e9a7a46c726ee900..d5556cc0c2edafd2735b09847941a6666f4b26dc 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -53,6 +53,7 @@ source_set("browser") { @@ -568,10 +568,10 @@ index 0f1bc6f3804309f513cbc700cc10e8b173a68dc0..fae7865cda633ae96df60b2d8d6beb13 /////////////////////////////////////////////////////////////////////////////// diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index f1dbc483ec57d2a1cc409b9d82448879f84ffeae..1c85063d6df14dafa5a4334046e1eadaf314443b 100644 +index 8e1115c6b2d259ca8d8fb163f6d8fa020a46ae31..b801ab4a2349867f53ba7abbd9974d5238c5ec75 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -220,6 +220,7 @@ source_set("common") { +@@ -235,6 +235,7 @@ source_set("common") { "//content:content_implementation", "//build/config:precompiled_headers", ] @@ -660,7 +660,7 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019 } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index c970dd6d3ad7d40a919b0dd99c2d5b81652646ab..0a93246100832dac7dd4f32966ef4c80d5c9b6bb 100644 +index b71775e869ee6e48754ce9e5a476bb76fefc48b4..d59d1b1245cdd49b3c68225d4cefdc3899c08f9c 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -474,6 +474,7 @@ static_library("test_support") { diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 70cbea5854799..96d539f475c2e 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -829,10 +829,10 @@ index 3cf735c0bf3ba4ed4a871f4608f43cf9767de62f..fccabc0c51ba2fc1ccd8646d30da782f // Calculate number of pages in source document. uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame, diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index ec74ae5fa01ca89e048ec2deef7776d3f28058c0..d4fa8d145d6da8b14b0782266dc5fde1a114f532 100644 +index d5556cc0c2edafd2735b09847941a6666f4b26dc..e6074c6e0869c32c622a692e18024e65da96d189 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2987,8 +2987,9 @@ source_set("browser") { +@@ -2972,8 +2972,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index c24ff5339fe39..4e5b88a11822c 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,7 +30,7 @@ index c4255d8dfc2e3c4f1f32506e4e9edbb90a74340a..142398a8adafc94e6724ee750b612a66 // 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 28ad2c8655d8c1d7797af01aca30223e767bffad..ffa768224af4d9ba012581d7facd34d8a03dcfd8 100644 +index f3955c5e0c491df9cf4d42ca8908e6986256e7cf..ff3d1d4b581512b01bfb82be4c4fc567b2fe636f 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2141,6 +2141,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { @@ -44,10 +44,10 @@ index 28ad2c8655d8c1d7797af01aca30223e767bffad..ffa768224af4d9ba012581d7facd34d8 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 3e2bd94628cdfadc07aeb6a570a4bbe6c0432865..b105731ae674c17a2200a1407ddc7c0c0d079481 100644 +index 0140932cdaf89e22afc82360d279e64d17fd7571..23dc228f0d8960de981b618e17cf557d8531028f 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5108,6 +5108,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -5139,6 +5139,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } @@ -60,10 +60,10 @@ index 3e2bd94628cdfadc07aeb6a570a4bbe6c0432865..b105731ae674c17a2200a1407ddc7c0c 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 10b3b8db55fd51ada493d4287980634949167908..02c2bc699474ed7608ba420d2195b528de4c8934 100644 +index f3189bdea78c973346a58c24f22614bbebc80a77..adbc4bc53b15d3cac21cabdca0515495bc6d2b72 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -1007,6 +1007,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -1010,6 +1010,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; void SendActiveState(bool active) override; TextInputManager* GetTextInputManager() override; diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index f7072ee9386da..978f2f11d4034 100644 --- a/patches/chromium/web_contents.patch +++ b/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 f613979626d88506c28e66a48165d9efc1f0f63c..fdcf69670caae0622f9f641e59ac735ee7504bad 100644 +index 27558a8da6a6fb8c8db636b1d0c3ad67b5016ae3..c8e58dfe5c20e3a9bec13c3522e76d152bb929d3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3451,6 +3451,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3466,6 +3466,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 f613979626d88506c28e66a48165d9efc1f0f63c..fdcf69670caae0622f9f641e59ac735e std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3461,6 +3468,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3476,6 +3483,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -35,10 +35,10 @@ index f613979626d88506c28e66a48165d9efc1f0f63c..fdcf69670caae0622f9f641e59ac735e CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 668d0802d8d9f9b5a9c6ae274e01d38babbaf9cb..bb05f50ab594a6ff599b407ad35ce03e47e0e4f1 100644 +index 0daa926807fed575455a143105618cc169a905d7..33764ec81294b07a3da4fa4fb0a1cd2f9bc56f54 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h -@@ -99,10 +99,13 @@ class BrowserContext; +@@ -100,10 +100,13 @@ class BrowserContext; class BrowserPluginGuestDelegate; class RenderFrameHost; class RenderViewHost; @@ -52,7 +52,7 @@ index 668d0802d8d9f9b5a9c6ae274e01d38babbaf9cb..bb05f50ab594a6ff599b407ad35ce03e class WebUI; struct DropData; struct MHTMLGenerationParams; -@@ -249,6 +252,10 @@ class WebContents : public PageNavigator, +@@ -250,6 +253,10 @@ class WebContents : public PageNavigator, network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags::kNone; diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 947298b6d45d8..349ec4f09e5d9 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/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 3cd17df056104948ea7ea373f25129a276c8d288..f9bfc58138a2c6ce05c71cf279112a79767b9cbf 100644 +index b16b3aabb38b5d992de01d5a6d0ab713fc175fd8..044c3057714ad79c0a7a4bd1ee374e6068ad8aa4 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -7442,6 +7442,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -7435,6 +7435,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } @@ -37,10 +37,10 @@ index 3cd17df056104948ea7ea373f25129a276c8d288..f9bfc58138a2c6ce05c71cf279112a79 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 fdcf69670caae0622f9f641e59ac735ee7504bad..e7778ffef3c737d69af2713820027776f4119a64 100644 +index c8e58dfe5c20e3a9bec13c3522e76d152bb929d3..82963e49fdccf50881ff031dcde89926ce650d4e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3705,21 +3705,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -3720,21 +3720,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index fdcf69670caae0622f9f641e59ac735ee7504bad..e7778ffef3c737d69af2713820027776 } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -3855,7 +3859,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -3870,7 +3874,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame, options)); DCHECK(requesting_frame->IsActive()); From e1e9504c35545dc784a58eebbf16962e04ac783f Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 3 Jan 2024 21:32:13 +0100 Subject: [PATCH 12/27] 5094458: Remove extra CGColorSpace parameters from skia and ui helpers https://chromium-review.googlesource.com/c/chromium/src/+/5094458 --- shell/browser/notifications/mac/cocoa_notification.mm | 3 +-- shell/browser/ui/message_box_mac.mm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/shell/browser/notifications/mac/cocoa_notification.mm b/shell/browser/notifications/mac/cocoa_notification.mm index 73b4337a36dca..c073dd2e531df 100644 --- a/shell/browser/notifications/mac/cocoa_notification.mm +++ b/shell/browser/notifications/mac/cocoa_notification.mm @@ -45,8 +45,7 @@ } if (!options.icon.drawsNothing()) { - NSImage* image = skia::SkBitmapToNSImageWithColorSpace( - options.icon, base::mac::GetGenericRGBColorSpace()); + NSImage* image = skia::SkBitmapToNSImage(options.icon); [notification_ setContentImage:image]; } diff --git a/shell/browser/ui/message_box_mac.mm b/shell/browser/ui/message_box_mac.mm index 63d93d3efe534..e1f6e5fde8c02 100644 --- a/shell/browser/ui/message_box_mac.mm +++ b/shell/browser/ui/message_box_mac.mm @@ -97,8 +97,7 @@ } if (!settings.icon.isNull()) { - NSImage* image = skia::SkBitmapToNSImageWithColorSpace( - *settings.icon.bitmap(), base::mac::GetGenericRGBColorSpace()); + NSImage* image = skia::SkBitmapToNSImage(*settings.icon.bitmap()); [alert setIcon:image]; } From 537f005d0c802f456ceeeabe30c03ce6717f27a6 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:00:53 +0000 Subject: [PATCH 13/27] chore: bump chromium in DEPS to 122.0.6226.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index fb36a81f5b429..d1575f51fb17c 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6224.0', + '122.0.6226.0', 'node_version': 'v20.10.0', 'nan_version': From 4378034c2a4b8f1356f706855283889c288c66b1 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:12:07 +0000 Subject: [PATCH 14/27] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 8 ++++---- ...o_not_depend_on_packed_resource_integrity.patch | 10 +++++----- patches/chromium/can_create_window.patch | 10 +++++----- ...o_handle_synthetic_mouse_events_for_touch.patch | 2 +- ...chore_introduce_blocking_api_for_electron.patch | 6 +++--- ...ntentscreationoverridden_with_full_params.patch | 4 ++-- patches/chromium/enable_reset_aspect_ratio.patch | 2 +- .../expose_setuseragent_on_networkcontext.patch | 4 ++-- ...x_activate_background_material_on_windows.patch | 2 +- .../chromium/fix_aspect_ratio_with_max_size.patch | 2 +- ...n-keyboard_hides_on_input_blur_in_webview.patch | 4 ++-- .../fix_remove_caption-removing_style_call.patch | 2 +- .../mas_avoid_private_macos_api_usage.patch.patch | 14 +++++++------- ...low_remote_certificate_verification_logic.patch | 4 ++-- ...cursor_changes_to_the_webcontentsobserver.patch | 6 +++--- patches/chromium/scroll_bounce_flag.patch | 4 ++-- patches/chromium/web_contents.patch | 6 +++--- patches/chromium/webview_fullscreen.patch | 6 +++--- ...ose_ui_to_allow_electron_to_set_dock_side.patch | 2 +- 19 files changed, 49 insertions(+), 49 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 06347a34830f0..fec964afa5160 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 79162faef6654f52651ffdff5705f7b27d2ae4f2..8148896d3f12772a1b4ba04601c57d9e int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 760adefe3056e628a551218526529ccaa60049e7..35c5ade30918fd9f47b86922880d2a790e98b60d 100644 +index 5f303065e7e14925e21b6491da61682c1450dd8d..05885b6f22659d480f4cdeee09820f01f5c031f8 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4564,6 +4564,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4568,6 +4568,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index 760adefe3056e628a551218526529ccaa60049e7..35c5ade30918fd9f47b86922880d2a79 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index f6a8e125b367a147ff5c63ead8beded8c000cc10..9a468f7796bdf95e40ab9c31fd9fa36d1ea0bd3b 100644 +index 3c90db6b70042c455ca7090578153ba06dd64494..5fdb01f7c17b57b3163075fbeec7c945aae53c5e 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -623,6 +623,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -634,6 +634,8 @@ class CONTENT_EXPORT RenderFrameImpl void DidObserveLayoutShift(double score, bool after_input_or_scroll) override; void DidCreateScriptContext(v8::Local context, int world_id) override; diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 7fd217edc9f95..f6be88da2e585 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -46,10 +46,10 @@ index 516f8d3bc275f7b3ae30b9058b9859ee95ba838f..e0cf50648db41b1ab38ac9801446fc30 sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index bf022c0f8cec66a5f273346a75eb49f0b03b463c..8f4156b043a6d8d88bbe39926b3feffdc0f61e11 100644 +index 6c7b271326752659d33fd75b573585d0d69b46e6..018cc63bca799a866a5d2fed705ff2196ac4dc05 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7191,7 +7191,6 @@ if (!is_fuchsia) { +@@ -7193,7 +7193,6 @@ if (!is_fuchsia) { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index bf022c0f8cec66a5f273346a75eb49f0b03b463c..8f4156b043a6d8d88bbe39926b3feffd "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -7212,6 +7211,10 @@ if (!is_fuchsia) { +@@ -7214,6 +7213,10 @@ if (!is_fuchsia) { "//ui/resources", ] @@ -68,7 +68,7 @@ index bf022c0f8cec66a5f273346a75eb49f0b03b463c..8f4156b043a6d8d88bbe39926b3feffd ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -8231,7 +8234,6 @@ if (!is_fuchsia) { +@@ -8233,7 +8236,6 @@ if (!is_fuchsia) { } deps += [ @@ -76,7 +76,7 @@ index bf022c0f8cec66a5f273346a75eb49f0b03b463c..8f4156b043a6d8d88bbe39926b3feffd "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter", -@@ -8324,6 +8326,10 @@ if (!is_fuchsia) { +@@ -8326,6 +8328,10 @@ if (!is_fuchsia) { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 8b7365fee1590..155b5fdcfe2ec 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -21,10 +21,10 @@ index 2b61af0a7453bced2fc476ca835f8924304a90d6..b16b3aabb38b5d992de01d5a6d0ab713 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 1eb685859edce97ca0d45702aaf5cf0effa3c190..0140932cdaf89e22afc82360d279e64d17fd7571 100644 +index fa99e2512acb61f786a6def0d59efd7f058bddfb..5117c1e2ed6c6232f98577ed10710abce91abe76 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4511,6 +4511,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4497,6 +4497,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( auto* new_contents_impl = new_contents.get(); @@ -37,7 +37,7 @@ index 1eb685859edce97ca0d45702aaf5cf0effa3c190..0140932cdaf89e22afc82360d279e64d // 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 -@@ -4552,12 +4558,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4538,12 +4544,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( AddWebContentsDestructionObserver(new_contents_impl); } @@ -148,10 +148,10 @@ index 4b32bf8ccc4ed370e2d1a218ae1fd69a98e23636..b9168a2488f5c4977eba5856882b561e // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 2f0ea25dab58f9750749f8c25b3acd60ec2c655e..760adefe3056e628a551218526529ccaa60049e7 100644 +index 65d6ae137bafb073476aad0e536c66cc95184251..5f303065e7e14925e21b6491da61682c1450dd8d 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6551,6 +6551,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6555,6 +6555,10 @@ WebView* RenderFrameImpl::CreateNewWindow( request.HasUserGesture(), GetWebFrame()->IsAdFrame(), GetWebFrame()->IsAdScriptInStack()); diff --git a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch index f46f399f67443..3a53519e5f9a7 100644 --- a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch +++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch @@ -34,7 +34,7 @@ index 013f571b521682e3f3381fd9fabc6e949d624fa3..5b1cacf1e9ce082712762785cc9bfe2f Widget* GetWidget(); const Widget* GetWidget() const; diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 9ddf5e7d00d81b292ecc66bdac911dbb2d1d3fd1..517d137e35e6a270136b7f8cda17695eb96d6896 100644 +index ecabc717aa51fd636aed60a06120186ac4ee9de3..45d1e126667cfcd782ec82f4368f698f9107ec65 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -3114,15 +3114,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, diff --git a/patches/chromium/chore_introduce_blocking_api_for_electron.patch b/patches/chromium/chore_introduce_blocking_api_for_electron.patch index a6f0f0c0e13c2..1a0e3a5620bb3 100644 --- a/patches/chromium/chore_introduce_blocking_api_for_electron.patch +++ b/patches/chromium/chore_introduce_blocking_api_for_electron.patch @@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor of explicitly adding ScopedAllowBlocking calls as friends. diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index bfdfa06b2b2fab3f7b5f027bd1840a1218ead7ee..16d8d70d94b53b8b7930bd39e90a463ed1a3f79f 100644 +index 53775a0aa1350ee433e3b23530fb0e246e575d2f..4e056adb25e0a32bc85fb16debe7844966d51f10 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -135,6 +135,7 @@ class KeyStorageLinux; @@ -28,7 +28,7 @@ index bfdfa06b2b2fab3f7b5f027bd1840a1218ead7ee..16d8d70d94b53b8b7930bd39e90a463e namespace enterprise_connectors { class LinuxKeyRotationCommand; } // namespace enterprise_connectors -@@ -563,6 +567,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { +@@ -564,6 +568,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { friend class ::DesktopNotificationBalloon; friend class ::FirefoxProfileLock; friend class ::GaiaConfig; @@ -36,7 +36,7 @@ index bfdfa06b2b2fab3f7b5f027bd1840a1218ead7ee..16d8d70d94b53b8b7930bd39e90a463e friend class ::ProfileImpl; friend class ::ScopedAllowBlockingForProfile; friend class ::StartupTabProviderImpl; -@@ -601,6 +606,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { +@@ -602,6 +607,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking { friend class crosapi::LacrosThreadTypeDelegate; friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847 friend class drive::FakeDriveService; diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 488838f612428..a22199b733f5c 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 23dc228f0d8960de981b618e17cf557d8531028f..27558a8da6a6fb8c8db636b1d0c3ad67b5016ae3 100644 +index 365392d6dcc8798e6e0303623a3c79ec938efaca..6dd022d48771d2fb27993aa0412e28b513db5c43 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4417,8 +4417,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4403,8 +4403,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( if (delegate_ && delegate_->IsWebContentsCreationOverridden( source_site_instance, params.window_container_type, diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch index 7b19c5e5a518b..24fa488a642ca 100644 --- a/patches/chromium/enable_reset_aspect_ratio.patch +++ b/patches/chromium/enable_reset_aspect_ratio.patch @@ -19,7 +19,7 @@ index 5e613d18403997123fb665792c0275643e91a6e9..a51018a455c114d9c3b15dd2628e6ab6 excluded_margin); } diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 8044dca7ed9de0b050fc26eaf884ca8d10ff458c..3327fe134545179d5eb1fb098d41805366c30b88 100644 +index 36a6e980495ea68d8477a5107dc803294a5711d8..fcc084bb28658b6ca3614815978e3889c3886d43 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -959,8 +959,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen, diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index 8a12ca4f78d64..22bd53e160886 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -63,10 +63,10 @@ index bd06da51ad2106b6a95abb9d773d66ca7d4f8c15..68afc1e30d65fd19923d7e5699e7e07c 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 7309c263eb58a21129427c8fbb47feb2ef8f1c77..9ea5b55338c2a0351996fa7e1c12445a91dab9e4 100644 +index fc3b31beea192b21f24f35debf6df12dfab40c65..9a4cfeeb29faa7523c751cec69c53586254e7382 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -1240,6 +1240,9 @@ interface NetworkContext { +@@ -1248,6 +1248,9 @@ interface NetworkContext { SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id, NetworkConditions? conditions); diff --git a/patches/chromium/fix_activate_background_material_on_windows.patch b/patches/chromium/fix_activate_background_material_on_windows.patch index 06e2c436362bf..f003fa8a2d5c7 100644 --- a/patches/chromium/fix_activate_background_material_on_windows.patch +++ b/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 23905a6b7f739ff3c6f391f984527ef5d2ed0bd9..aed8894a5514fddfc8d15b8fb4ae611fa4493b6f 100644 +index 64aa90f0fcd7fb2a66b8ea98ab355c4f4f6ffa08..740f92ec4e355032d02138c87d6c4473c8abd3a1 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -901,13 +901,13 @@ void HWNDMessageHandler::FrameTypeChanged() { diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch index 07f097c201a2a..54d62118c5d85 100644 --- a/patches/chromium/fix_aspect_ratio_with_max_size.patch +++ b/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 3327fe134545179d5eb1fb098d41805366c30b88..9ddf5e7d00d81b292ecc66bdac911dbb2d1d3fd1 100644 +index fcc084bb28658b6ca3614815978e3889c3886d43..ecabc717aa51fd636aed60a06120186ac4ee9de3 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -3661,14 +3661,29 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param, diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index fc5042f32ab2a..a28ebd9c5c9c5 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -45,10 +45,10 @@ index e340087e3ab2f07937ed6e6bd8e0ec8aa2a76d48..2b29e246b2f6ecf5d7605abfa3602864 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 82963e49fdccf50881ff031dcde89926ce650d4e..f443d784d9477562e41d72d421e4a3c03dca63f7 100644 +index 6a63adbf8aa3179f457a7525d2aac1ce60b92090..4547490a8d5988ad3608cd07ae7330411e3e14e5 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -8690,7 +8690,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -8661,7 +8661,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/fix_remove_caption-removing_style_call.patch b/patches/chromium/fix_remove_caption-removing_style_call.patch index 3ce497b10e9a3..ae8d1c9f34b77 100644 --- a/patches/chromium/fix_remove_caption-removing_style_call.patch +++ b/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 517d137e35e6a270136b7f8cda17695eb96d6896..23905a6b7f739ff3c6f391f984527ef5d2ed0bd9 100644 +index 45d1e126667cfcd782ec82f4368f698f9107ec65..64aa90f0fcd7fb2a66b8ea98ab355c4f4f6ffa08 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -1734,7 +1734,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) { diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 16655581fc94d..96e783342ca3a 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,10 +35,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index ee7e9dd96052fab076e2675ec07e8061662321f7..e2519929397c31c7449691c02673dd9a7f7ac8c9 100644 +index ff71625d3745fe7a667642bb06579febb5ea4a6b..0f7bab84e53a5b9a5c9e6b312806d90d84c10069 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1034,6 +1034,7 @@ component("base") { +@@ -1037,6 +1037,7 @@ component("base") { "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", @@ -777,7 +777,7 @@ index e321b406a8375986b41d64342919bb0e8c5e58eb..8081d53adab80a6fccfdb4cd6f608c3b if (is_ios) { sources += [ "image_transport_surface_ios.mm" ] diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h -index f8d4dc33b5687122420af314d597679d16126e00..e187d08374b74314fa817ebb0ba7f28f6f6764b9 100644 +index b994079339dc0aebd86dac807645f81c2974fb96..b05e35c8eabccfd3147030d03453d78e76cdc5d2 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.h +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h @@ -23,7 +23,9 @@ @@ -802,10 +802,10 @@ index f8d4dc33b5687122420af314d597679d16126e00..e187d08374b74314fa817ebb0ba7f28f gfx::Size pixel_size_; diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -index 1f4f64ad8f5d37dfdd6e51e97ce2fb743abfcd90..9531c528b84b9d7a0b59c3abb1a21fafad7c1ec4 100644 +index 9c4e8e2536819610648aa5b3d11eaa5d2da24a9c..0b3660e51b0a15102b7b1726e17b34d582b3576e 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -@@ -67,12 +67,16 @@ +@@ -72,12 +72,16 @@ } // namespace ImageTransportSurfaceOverlayMacEGL::ImageTransportSurfaceOverlayMacEGL() @@ -823,7 +823,7 @@ index 1f4f64ad8f5d37dfdd6e51e97ce2fb743abfcd90..9531c528b84b9d7a0b59c3abb1a21faf ca_layer_tree_coordinator_ = std::make_unique( use_remote_layer_api_, !av_disabled_at_command_line); -@@ -93,6 +97,10 @@ +@@ -98,6 +102,10 @@ #endif ca_context_.layer = ca_layer_tree_coordinator_->GetCALayerForDisplay(); } @@ -834,7 +834,7 @@ index 1f4f64ad8f5d37dfdd6e51e97ce2fb743abfcd90..9531c528b84b9d7a0b59c3abb1a21faf } ImageTransportSurfaceOverlayMacEGL::~ImageTransportSurfaceOverlayMacEGL() { -@@ -221,9 +229,13 @@ +@@ -235,9 +243,13 @@ TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers", TRACE_EVENT_SCOPE_THREAD, "GLImpl", static_cast(gl::GetGLImplementation()), "width", pixel_size_.width()); diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index 0745e18fcefbf..e069c58db3ea5 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -177,7 +177,7 @@ index 5a8232b338453ce3374d51ceebe8a85fc26f2a52..bd06da51ad2106b6a95abb9d773d66ca std::unique_ptr internal_host_resolver_; // Map values set to non-null only if that HostResolver has its own private diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 4844780c61f5010afac7006917970fdad952371f..7309c263eb58a21129427c8fbb47feb2ef8f1c77 100644 +index b80b7c98ddd4660ef63f0d40c8889c7e71dfde81..fc3b31beea192b21f24f35debf6df12dfab40c65 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -310,6 +310,16 @@ struct SocketBrokerRemotes { @@ -197,7 +197,7 @@ index 4844780c61f5010afac7006917970fdad952371f..7309c263eb58a21129427c8fbb47feb2 // Parameters for constructing a network context. struct NetworkContextParams { -@@ -944,6 +954,9 @@ interface NetworkContext { +@@ -952,6 +962,9 @@ interface NetworkContext { // Sets a client for this network context. SetClient(pending_remote client); diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 4e5b88a11822c..59f315c147d77 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -44,10 +44,10 @@ index f3955c5e0c491df9cf4d42ca8908e6986256e7cf..ff3d1d4b581512b01bfb82be4c4fc567 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 0140932cdaf89e22afc82360d279e64d17fd7571..23dc228f0d8960de981b618e17cf557d8531028f 100644 +index 5117c1e2ed6c6232f98577ed10710abce91abe76..365392d6dcc8798e6e0303623a3c79ec938efaca 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5139,6 +5139,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { +@@ -5109,6 +5109,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { return text_input_manager_.get(); } @@ -60,7 +60,7 @@ index 0140932cdaf89e22afc82360d279e64d17fd7571..23dc228f0d8960de981b618e17cf557d 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 f3189bdea78c973346a58c24f22614bbebc80a77..adbc4bc53b15d3cac21cabdca0515495bc6d2b72 100644 +index 6780cdfd13c1eea6de94255ec6c1e991fc29d93a..c468cc9b77a8e2a1f153d76f2023a3213645b634 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -1010,6 +1010,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index 1573b2d54e906..a13a48ebdbf02 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/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 1cfc75e09957393ea32a4b800893fd4cf53f5e62..57805246ec1c8401fe3582f582ff14cc2bb6380e 100644 +index 7edafe2ef79313059c3e358c135272802c6db719..17de4f7e6afb6f4e31dd56c469c0cf4a0e0015f0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1220,7 +1220,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { +@@ -1223,7 +1223,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 978f2f11d4034..7bed4d32c570c 100644 --- a/patches/chromium/web_contents.patch +++ b/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 27558a8da6a6fb8c8db636b1d0c3ad67b5016ae3..c8e58dfe5c20e3a9bec13c3522e76d152bb929d3 100644 +index 6dd022d48771d2fb27993aa0412e28b513db5c43..9e61db7f810bac39ea6fe37c28770bd9b088d7f2 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3466,6 +3466,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3452,6 +3452,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 27558a8da6a6fb8c8db636b1d0c3ad67b5016ae3..c8e58dfe5c20e3a9bec13c3522e76d15 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3476,6 +3483,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3462,6 +3469,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 349ec4f09e5d9..9b3e28f7e2fd5 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -37,10 +37,10 @@ index b16b3aabb38b5d992de01d5a6d0ab713fc175fd8..044c3057714ad79c0a7a4bd1ee374e60 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 c8e58dfe5c20e3a9bec13c3522e76d152bb929d3..82963e49fdccf50881ff031dcde89926ce650d4e 100644 +index 9e61db7f810bac39ea6fe37c28770bd9b088d7f2..6a63adbf8aa3179f457a7525d2aac1ce60b92090 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3720,21 +3720,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( +@@ -3706,21 +3706,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( const NativeWebKeyboardEvent& event) { OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"), "WebContentsImpl::PreHandleKeyboardEvent"); @@ -78,7 +78,7 @@ index c8e58dfe5c20e3a9bec13c3522e76d152bb929d3..82963e49fdccf50881ff031dcde89926 } bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { -@@ -3870,7 +3874,7 @@ void WebContentsImpl::EnterFullscreenMode( +@@ -3856,7 +3860,7 @@ void WebContentsImpl::EnterFullscreenMode( OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); DCHECK(CanEnterFullscreenMode(requesting_frame, options)); DCHECK(requesting_frame->IsActive()); diff --git a/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch b/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch index f3de6dffebff4..cf33b9a86abd8 100644 --- a/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch +++ b/patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch @@ -10,7 +10,7 @@ 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 35371ef12b4d3286a9457c2c412bb9bb854095a5..27f65fae65acdeb6e8b8b5f3d6f326aeb05b5c24 100644 +index 42707f3aed0dd3d6089178973c74afe17a0db273..2a359641e52579b062521a7ed4e21763bd6fd172 100644 --- a/front_end/entrypoints/main/MainImpl.ts +++ b/front_end/entrypoints/main/MainImpl.ts @@ -726,6 +726,8 @@ export class MainImpl { From b56d43345b0b2bf4da707e2d23ddec87c879fc18 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:18:06 +0000 Subject: [PATCH 15/27] chore: bump chromium in DEPS to 122.0.6227.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index d1575f51fb17c..c1303ce6c97e8 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6226.0', + '122.0.6227.0', 'node_version': 'v20.10.0', 'nan_version': From b48da0f939008ca47c1a989236495a637abc73c1 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:31:30 +0000 Subject: [PATCH 16/27] chore: update patches --- patches/chromium/can_create_window.patch | 2 +- .../chore_add_buildflag_guard_around_new_include.patch | 2 +- ...ide_iswebcontentscreationoverridden_with_full_params.patch | 2 +- ...ix_on-screen-keyboard_hides_on_input_blur_in_webview.patch | 4 ++-- ...tor_expose_cursor_changes_to_the_webcontentsobserver.patch | 4 ++-- patches/chromium/web_contents.patch | 2 +- patches/chromium/webview_fullscreen.patch | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 155b5fdcfe2ec..eb981fffbd55e 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -21,7 +21,7 @@ index 2b61af0a7453bced2fc476ca835f8924304a90d6..b16b3aabb38b5d992de01d5a6d0ab713 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index fa99e2512acb61f786a6def0d59efd7f058bddfb..5117c1e2ed6c6232f98577ed10710abce91abe76 100644 +index b697613172afdd75ba76fe882aa824395edeb95f..fef61b66b4151779ef5b3ea5e51c6278251263d4 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4497,6 +4497,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( diff --git a/patches/chromium/chore_add_buildflag_guard_around_new_include.patch b/patches/chromium/chore_add_buildflag_guard_around_new_include.patch index 7453be885e7ef..639046d892924 100644 --- a/patches/chromium/chore_add_buildflag_guard_around_new_include.patch +++ b/patches/chromium/chore_add_buildflag_guard_around_new_include.patch @@ -9,7 +9,7 @@ This is an experimental commit; but if it's successful, This patch should be upstreamed and then removed from electron's code. diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 033994435788694211052bd7d6e16fa9417f5628..07944d2678d303457204543ba392d011fe399930 100644 +index d028fb25d8f095243a2ff07a799091159d081679..708c47987973c9267ff4cab7781a1d923e91d268 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -43,7 +43,6 @@ diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index a22199b733f5c..794da22ed5de9 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -218,7 +218,7 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 365392d6dcc8798e6e0303623a3c79ec938efaca..6dd022d48771d2fb27993aa0412e28b513db5c43 100644 +index b62e7b83fab208b069006b1255bc24c28e34b5e6..7071ada887c5f4bc73bc3ec41dc77dadd290963d 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4403,8 +4403,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index a28ebd9c5c9c5..41bdafddfd0bc 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -45,10 +45,10 @@ index e340087e3ab2f07937ed6e6bd8e0ec8aa2a76d48..2b29e246b2f6ecf5d7605abfa3602864 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 6a63adbf8aa3179f457a7525d2aac1ce60b92090..4547490a8d5988ad3608cd07ae7330411e3e14e5 100644 +index 5adeba5c2286b7914355d6e7aa5502c55ac3160d..85225b3667d9bc4c40896173d7291b7ac6d02ea0 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -8661,7 +8661,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -8645,7 +8645,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view = diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 59f315c147d77..c0d6d71d5709a 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -44,7 +44,7 @@ index f3955c5e0c491df9cf4d42ca8908e6986256e7cf..ff3d1d4b581512b01bfb82be4c4fc567 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 5117c1e2ed6c6232f98577ed10710abce91abe76..365392d6dcc8798e6e0303623a3c79ec938efaca 100644 +index fef61b66b4151779ef5b3ea5e51c6278251263d4..b62e7b83fab208b069006b1255bc24c28e34b5e6 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -5109,6 +5109,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -60,7 +60,7 @@ index 5117c1e2ed6c6232f98577ed10710abce91abe76..365392d6dcc8798e6e0303623a3c79ec 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 6780cdfd13c1eea6de94255ec6c1e991fc29d93a..c468cc9b77a8e2a1f153d76f2023a3213645b634 100644 +index 554e211dfc6683650fb8623f6dfff6935a16958a..bd7cfc7f3d86ecf978a1fcb443454e87bdbb363f 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -1010,6 +1010,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 7bed4d32c570c..7568afdeb2193 100644 --- a/patches/chromium/web_contents.patch +++ b/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 6dd022d48771d2fb27993aa0412e28b513db5c43..9e61db7f810bac39ea6fe37c28770bd9b088d7f2 100644 +index 7071ada887c5f4bc73bc3ec41dc77dadd290963d..c10d735a155c710435544ef885072d864ede1e3f 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3452,6 +3452,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 9b3e28f7e2fd5..1f811f264802b 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/patches/chromium/webview_fullscreen.patch @@ -37,7 +37,7 @@ index b16b3aabb38b5d992de01d5a6d0ab713fc175fd8..044c3057714ad79c0a7a4bd1ee374e60 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 9e61db7f810bac39ea6fe37c28770bd9b088d7f2..6a63adbf8aa3179f457a7525d2aac1ce60b92090 100644 +index c10d735a155c710435544ef885072d864ede1e3f..5adeba5c2286b7914355d6e7aa5502c55ac3160d 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3706,21 +3706,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( From 3258d2550dd47253de2243792c283e00dd2471dd Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:00:46 +0000 Subject: [PATCH 17/27] chore: bump chromium in DEPS to 122.0.6228.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c1303ce6c97e8..72f9e5d4d21c7 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6227.0', + '122.0.6228.0', 'node_version': 'v20.10.0', 'nan_version': From c50e3253a4e8b0a26727a13ac1e0fc296eae10c6 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:11:21 +0000 Subject: [PATCH 18/27] chore: update patches --- ...o_not_depend_on_packed_resource_integrity.patch | 14 +++++++------- .../chromium/disable_color_correct_rendering.patch | 4 ++-- .../fix_harden_blink_scriptstate_maybefrom.patch | 4 ++-- .../mas_avoid_private_macos_api_usage.patch.patch | 4 ++-- patches/chromium/printing.patch | 4 ++-- ...add_v8_object_setinternalfieldfornodecore.patch | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index f6be88da2e585..3081e7af4d094 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -33,10 +33,10 @@ index 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449f "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 516f8d3bc275f7b3ae30b9058b9859ee95ba838f..e0cf50648db41b1ab38ac9801446fc303fcc7c0d 100644 +index 4533a1d4399b69026be0b08314c9984c9ca058de..dd0ac145c6bad6ec5e3486ea0fa6884a5bfabcbc 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4740,7 +4740,7 @@ static_library("browser") { +@@ -4745,7 +4745,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 516f8d3bc275f7b3ae30b9058b9859ee95ba838f..e0cf50648db41b1ab38ac9801446fc30 sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 6c7b271326752659d33fd75b573585d0d69b46e6..018cc63bca799a866a5d2fed705ff2196ac4dc05 100644 +index b7f6d03040572623d3cad7aab3e376bbf2f6cb06..a3d3ada8e38f82b4874b0d907e14e75cca85f8ec 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7193,7 +7193,6 @@ if (!is_fuchsia) { +@@ -7192,7 +7192,6 @@ if (!is_fuchsia) { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index 6c7b271326752659d33fd75b573585d0d69b46e6..018cc63bca799a866a5d2fed705ff219 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -7214,6 +7213,10 @@ if (!is_fuchsia) { +@@ -7213,6 +7212,10 @@ if (!is_fuchsia) { "//ui/resources", ] @@ -68,7 +68,7 @@ index 6c7b271326752659d33fd75b573585d0d69b46e6..018cc63bca799a866a5d2fed705ff219 ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -8233,7 +8236,6 @@ if (!is_fuchsia) { +@@ -8232,7 +8235,6 @@ if (!is_fuchsia) { } deps += [ @@ -76,7 +76,7 @@ index 6c7b271326752659d33fd75b573585d0d69b46e6..018cc63bca799a866a5d2fed705ff219 "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter", -@@ -8326,6 +8328,10 @@ if (!is_fuchsia) { +@@ -8325,6 +8327,10 @@ if (!is_fuchsia) { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index bbb5068b922b4..c56dae50b18fd 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 539a44d96aecc9bd1b42c4409cdbeaa2b523822a..062c9432fa38ae1cd1d2f4e6baf6f41c109cd220 100644 +index f7fa1ade7280d58bf5dfd66995c0075e03e43d69..c25a285c25fec2a9be6a95d04929467a3ed0d718 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1891,6 +1891,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1911,6 +1911,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( TargetColorParams LayerTreeHostImpl::GetTargetColorParams( gfx::ContentColorUsage content_color_usage) const { TargetColorParams params; diff --git a/patches/chromium/fix_harden_blink_scriptstate_maybefrom.patch b/patches/chromium/fix_harden_blink_scriptstate_maybefrom.patch index 2582d75f3bb27..a1f4eb67e4168 100644 --- a/patches/chromium/fix_harden_blink_scriptstate_maybefrom.patch +++ b/patches/chromium/fix_harden_blink_scriptstate_maybefrom.patch @@ -86,7 +86,7 @@ index 7ff8785cd64c1264a88f91f7bd3292c6943f58ea..bc14ad8cab9fa3ec45bcb9f670b19897 // Cut the reference from ScriptState to V8 context. diff --git a/third_party/blink/renderer/platform/bindings/script_state.h b/third_party/blink/renderer/platform/bindings/script_state.h -index 6230f4272feb8aab426d45bebe55846020931bcf..2a973e435cfb0fbe4675a4a34bde8d3ecb9f4ac4 100644 +index 29ae73a8a3f4818f027e73b6e75e413c03750b5d..d49d2d094077d818bf25de96ec5f62319a5b411c 100644 --- a/third_party/blink/renderer/platform/bindings/script_state.h +++ b/third_party/blink/renderer/platform/bindings/script_state.h @@ -182,7 +182,12 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected { @@ -103,7 +103,7 @@ index 6230f4272feb8aab426d45bebe55846020931bcf..2a973e435cfb0fbe4675a4a34bde8d3e return nullptr; } ScriptState* script_state = -@@ -257,9 +262,15 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected { +@@ -251,9 +256,15 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected { static void SetCreateCallback(CreateCallback); friend class ScriptStateImpl; diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 96e783342ca3a..78a5cecc79286 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -431,7 +431,7 @@ index 14a52ca1254d4b583b44c20336cce1637b91f88c..618b9a6d680a2bfaf26ad3c7303a9508 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 768c5b2e30e725268f8e4154e9a7a46c726ee900..d5556cc0c2edafd2735b09847941a6666f4b26dc 100644 +index 79a279f732958b835f3fad6522a529d0c2561653..17011d3172f03b34447be0ae12b88212e1c4041d 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -53,6 +53,7 @@ source_set("browser") { @@ -660,7 +660,7 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019 } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index b71775e869ee6e48754ce9e5a476bb76fefc48b4..d59d1b1245cdd49b3c68225d4cefdc3899c08f9c 100644 +index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab68943e5d0f6 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -474,6 +474,7 @@ static_library("test_support") { diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 96d539f475c2e..ee765e23040a7 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -829,10 +829,10 @@ index 3cf735c0bf3ba4ed4a871f4608f43cf9767de62f..fccabc0c51ba2fc1ccd8646d30da782f // Calculate number of pages in source document. uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame, diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index d5556cc0c2edafd2735b09847941a6666f4b26dc..e6074c6e0869c32c622a692e18024e65da96d189 100644 +index 17011d3172f03b34447be0ae12b88212e1c4041d..b79c4460d9c090ba585c38e15347fe6b50d41cdb 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2972,8 +2972,9 @@ source_set("browser") { +@@ -2970,8 +2970,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch index cb4d63aab5100..277246d52c7f7 100644 --- a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch +++ b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch @@ -46,10 +46,10 @@ index 6cdf53b19c7d058bb66b9fcbe745874cc48daa99..8d112008c2667db97ed5b5af3f87c40d V8_INLINE static void* GetAlignedPointerFromInternalField( const BasicTracedReference& object, int index) { diff --git a/src/api/api.cc b/src/api/api.cc -index 851e9051455d42178608d7b86687b8e0e62f0bbe..9b5e8844224dcef10f1b8c349285b856507a666b 100644 +index a7ae86d05dafe42500df0cbbd7a956f35040a6b6..11d5e79c329aba8312e34b461582ecbf5e4d1890 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -6283,14 +6283,33 @@ Local v8::Object::SlowGetInternalField(int index) { +@@ -6284,14 +6284,33 @@ Local v8::Object::SlowGetInternalField(int index) { isolate); } From d754b154a02a975ea539893126b208d91824e83a Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:00:38 +0000 Subject: [PATCH 19/27] chore: bump chromium in DEPS to 122.0.6230.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 72f9e5d4d21c7..65231058b0ff3 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6228.0', + '122.0.6230.0', 'node_version': 'v20.10.0', 'nan_version': From 39f6445d7fc2266732da6a3383c2e21464ae6d93 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Sun, 7 Jan 2024 13:00:31 +0000 Subject: [PATCH 20/27] chore: bump chromium in DEPS to 122.0.6232.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 65231058b0ff3..5556f72e2b498 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6230.0', + '122.0.6232.0', 'node_version': 'v20.10.0', 'nan_version': From 893e892cf7f6c38a9575f49d38e44ea755b2cf60 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:00:47 +0000 Subject: [PATCH 21/27] chore: bump chromium in DEPS to 122.0.6234.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5556f72e2b498..ce99b405c1221 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6232.0', + '122.0.6234.0', 'node_version': 'v20.10.0', 'nan_version': From 40be72d6256a50f5bf5a8c22dcbc5782cbd01668 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:00:34 +0000 Subject: [PATCH 22/27] chore: bump chromium in DEPS to 122.0.6236.2 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index ce99b405c1221..a6ada27eb0b56 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '122.0.6234.0', + '122.0.6236.2', 'node_version': 'v20.10.0', 'nan_version': From b5d2c66cec2bc6f594a826bc35864fed6636d6fc Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 10 Jan 2024 23:22:27 +1300 Subject: [PATCH 23/27] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 8 ++-- ..._scheduler_throttling_per_renderview.patch | 6 +-- ..._windows_to_have_different_web_prefs.patch | 10 ++--- ..._secondary_label_via_simplemenumodel.patch | 14 +++---- .../build_add_electron_tracing_category.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 14 +++---- patches/chromium/can_create_window.patch | 28 +++++++------- ...screationoverridden_with_full_params.patch | 4 +- patches/chromium/command-ismediakey.patch | 2 +- .../crash_allow_setting_more_options.patch | 2 +- .../custom_protocols_plzserviceworker.patch | 2 +- .../disable_color_correct_rendering.patch | 8 ++-- .../disable_compositor_recycling.patch | 2 +- patches/chromium/disable_hidden.patch | 4 +- patches/chromium/disable_unload_metrics.patch | 6 +-- ...xpose_setuseragent_on_networkcontext.patch | 2 +- .../extend_apply_webpreferences.patch | 4 +- ...e_launch_options_for_service_process.patch | 20 +++++----- ..._raw_response_headers_from_urlloader.patch | 4 +- ...ding_non-standard_schemes_in_iframes.patch | 6 +-- ...media_key_usage_with_globalshortcuts.patch | 2 +- ...ingshelper_behind_branding_buildflag.patch | 4 +- ...board_hides_on_input_blur_in_webview.patch | 2 +- ...original_resize_performance_on_macos.patch | 2 +- patches/chromium/frame_host_manager.patch | 4 +- ...sync_with_host_os_mac_on_linux_in_ci.patch | 4 +- ...tform_electron_can_call_x11_property.patch | 4 +- ..._avoid_private_macos_api_usage.patch.patch | 38 +++++++++---------- ...emote_certificate_verification_logic.patch | 2 +- .../chromium/notification_provenance.patch | 6 +-- patches/chromium/picture-in-picture.patch | 6 +-- patches/chromium/printing.patch | 6 +-- ...r_changes_to_the_webcontentsobserver.patch | 8 ++-- .../render_widget_host_view_base.patch | 7 ++-- .../render_widget_host_view_mac.patch | 2 +- patches/chromium/scroll_bounce_flag.patch | 4 +- .../support_mixed_sandbox_with_zygote.patch | 4 +- patches/chromium/web_contents.patch | 2 +- patches/chromium/webview_fullscreen.patch | 6 +-- ...8_object_setinternalfieldfornodecore.patch | 2 +- 40 files changed, 132 insertions(+), 131 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index fec964afa5160..6bf14580d32b3 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 79162faef6654f52651ffdff5705f7b27d2ae4f2..8148896d3f12772a1b4ba04601c57d9e int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 5f303065e7e14925e21b6491da61682c1450dd8d..05885b6f22659d480f4cdeee09820f01f5c031f8 100644 +index 7697bf80f0c5ce35fae8eb015f8295cbbb384784..e3588346b73ef9ae253175ced52efc1e38009333 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4568,6 +4568,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4569,6 +4569,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index 5f303065e7e14925e21b6491da61682c1450dd8d..05885b6f22659d480f4cdeee09820f01 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index 3c90db6b70042c455ca7090578153ba06dd64494..5fdb01f7c17b57b3163075fbeec7c945aae53c5e 100644 +index 28918e8a779d409b13ffb6ff2865eb6766ba3bcd..ffb3f014d85448c22212575540d59700f35a90e3 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -634,6 +634,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -635,6 +635,8 @@ class CONTENT_EXPORT RenderFrameImpl void DidObserveLayoutShift(double score, bool after_input_or_scroll) override; void DidCreateScriptContext(v8::Local context, int world_id) override; diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index ff85a23d5595c..5209615c11b91 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -116,10 +116,10 @@ index 2ba868f0efb2ee082d452bb011409f1b4c5c5e1e..6caab2df3cfc367c63839b7ac635d8d0 // 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 169c9f73199d648b0513d5b4760c179be26ec1f0..26297bd0f723b3d62a4fc1b2a5ba5a214e15488b 100644 +index 56856aea2bdfa54d6589da27937a96e9b89d24f1..a6714774b3fd35c0f34f37ab27163bfc920a8212 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -2423,6 +2423,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( +@@ -2421,6 +2421,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal", "old_state", old_state, "new_state", new_state); @@ -130,7 +130,7 @@ index 169c9f73199d648b0513d5b4760c179be26ec1f0..26297bd0f723b3d62a4fc1b2a5ba5a21 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 && -@@ -3921,10 +3925,23 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3912,10 +3916,23 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch index f4226dad3110a..b8abe1d9ffcc8 100644 --- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch +++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch @@ -8,7 +8,7 @@ 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.cc b/third_party/blink/common/web_preferences/web_preferences.cc -index fa46daef1d7da536c434d41475d25ed8f8f933c6..37ae01f45d768afa4bfa538307cf2f08ba14b906 100644 +index 2afa734a8f0d500f2dedf6db5703f1167669f566..33a013252d4de19206a92b2762329b7ca1514e87 100644 --- a/third_party/blink/common/web_preferences/web_preferences.cc +++ b/third_party/blink/common/web_preferences/web_preferences.cc @@ -144,6 +144,19 @@ WebPreferences::WebPreferences() @@ -32,7 +32,7 @@ index fa46daef1d7da536c434d41475d25ed8f8f933c6..37ae01f45d768afa4bfa538307cf2f08 accelerated_video_decode_enabled(false), animation_policy( 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 bd5d2f9ba30d847a44e70c1173eb49a5d3f4b6bb..3ef312b2e84427ec1bcc738e88d6425255a96b20 100644 +index 9909d43a76d8bf5bd8e9b3523fe5be5f8740ad54..69bc9db9304547b272393727432f81d3510dd9cd 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 @@ -148,6 +148,19 @@ bool StructTraitsaccelerated_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 65cf8211005546a8c527a679306e5ad6617cc046..0c08e298107d1aa0d0809691a98dd12b2c0aeb5a 100644 +index 48134e1dd50c297ed987e4f8068612c420f038a3..a7902ae02436fe820feeb01a73ccd0a3e9b00946 100644 --- a/third_party/blink/public/common/web_preferences/web_preferences.h +++ b/third_party/blink/public/common/web_preferences/web_preferences.h @@ -10,6 +10,7 @@ @@ -88,7 +88,7 @@ index 65cf8211005546a8c527a679306e5ad6617cc046..0c08e298107d1aa0d0809691a98dd12b // This flags corresponds to a Page's Settings' setCookieEnabled state. It // only controls whether or not the "document.cookie" field is properly 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 c5cf0543740b47c12b0cd211a64152d8abee1d21..c1ffebd09f2547454bd1551cf5fc576dd384fac2 100644 +index 07d93df1824f4fb8d9b415f4cc1d6152d7f14355..c4fa257d9cbbe84065b8f092a78a91f52d64484e 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 @@ @@ -153,7 +153,7 @@ index c5cf0543740b47c12b0cd211a64152d8abee1d21..c1ffebd09f2547454bd1551cf5fc576d 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 d03fc2e4ccef645e31bab838dabf76ade7a35de8..ca35e4d6cf8fc49b8275a4b49bc4da8019282c3d 100644 +index e7c11ab3f46a12b860340f30dc09508c9e1af78b..e883537595b8b924faf121a4ce6866a4dc8b9567 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"; diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch index 54beaa9f87a4d..deb4fdd9b1646 100644 --- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch +++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch @@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc -index 30afdfc488f608851dd382d01aa5221c26d18180..e3a0540c933fc76a8f8717aca8e39f49d52ec033 100644 +index ffafdacb3e0171f81d22fa1736012b92e9df2ba9..dad79e82221c15b887cfde9a35ff7447989da62a 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId( @@ -33,7 +33,7 @@ index 30afdfc488f608851dd382d01aa5221c26d18180..e3a0540c933fc76a8f8717aca8e39f49 void SimpleMenuModel::SetMinorText(size_t index, const std::u16string& minor_text) { items_[ValidateItemIndex(index)].minor_text = minor_text; -@@ -422,6 +432,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const { +@@ -428,6 +438,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const { return items_[ValidateItemIndex(index)].label; } @@ -47,10 +47,10 @@ index 30afdfc488f608851dd382d01aa5221c26d18180..e3a0540c933fc76a8f8717aca8e39f49 return items_[ValidateItemIndex(index)].minor_text; } diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h -index c17c0242f07da0d66272691704c925147642a326..796635cd604c7ea831d98b2f07382a659588ab58 100644 +index 1539464b1942db2a5e493022109a1c8dc247dc5a..b3979cbccf8eb2f0145e050e11ecbb6303c38d46 100644 --- a/ui/base/models/simple_menu_model.h +++ b/ui/base/models/simple_menu_model.h -@@ -54,6 +54,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -55,6 +55,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { // Some command ids have labels and icons that change over time. virtual bool IsItemForCommandIdDynamic(int command_id) const; virtual std::u16string GetLabelForCommandId(int command_id) const; @@ -58,7 +58,7 @@ index c17c0242f07da0d66272691704c925147642a326..796635cd604c7ea831d98b2f07382a65 // Gets the icon for the item with the specified id. virtual ImageModel GetIconForCommandId(int command_id) const; -@@ -173,6 +174,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -174,6 +175,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { // Sets the label for the item at |index|. void SetLabel(size_t index, const std::u16string& label); @@ -68,7 +68,7 @@ index c17c0242f07da0d66272691704c925147642a326..796635cd604c7ea831d98b2f07382a65 // Sets the minor text for the item at |index|. void SetMinorText(size_t index, const std::u16string& minor_text); -@@ -211,6 +215,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -216,6 +220,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override; int GetCommandIdAt(size_t index) const override; std::u16string GetLabelAt(size_t index) const override; @@ -76,7 +76,7 @@ index c17c0242f07da0d66272691704c925147642a326..796635cd604c7ea831d98b2f07382a65 std::u16string GetMinorTextAt(size_t index) const override; ImageModel GetMinorIconAt(size_t index) const override; bool IsItemDynamicAt(size_t index) const override; -@@ -250,6 +255,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -255,6 +260,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { int command_id = 0; ItemType type = TYPE_COMMAND; std::u16string label; diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch index 2278757c8f6fb..a1990100a5036 100644 --- a/patches/chromium/build_add_electron_tracing_category.patch +++ b/patches/chromium/build_add_electron_tracing_category.patch @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us to introduce a new Electron category for Electron-specific tracing. diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index f82e41ee24e1dad66fc983492b3bc6461d6a254c..d0655deb5ded85a76b1cca1cab81320cd804c938 100644 +index f82e41ee24e1dad66fc983492b3bc6461d6a254c..5abab1e18398118ac928d60df302f9f545d27b9f 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h @@ -82,6 +82,7 @@ diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 3081e7af4d094..80a315909d3b6 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -33,10 +33,10 @@ index 3611378c052813bd9c9ab9ce7d1840d6535576bf..b148e0acaf28197ee1da634b5e4c449f "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 4533a1d4399b69026be0b08314c9984c9ca058de..dd0ac145c6bad6ec5e3486ea0fa6884a5bfabcbc 100644 +index 9e7f057a1c35d3e6ba3f144cfaf7dfe0ff1148a8..b2b2c49e745530b35b6ee7df080426afa4c64989 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4745,7 +4745,7 @@ static_library("browser") { +@@ -4746,7 +4746,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 4533a1d4399b69026be0b08314c9984c9ca058de..dd0ac145c6bad6ec5e3486ea0fa6884a sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index b7f6d03040572623d3cad7aab3e376bbf2f6cb06..a3d3ada8e38f82b4874b0d907e14e75cca85f8ec 100644 +index f56b2c37e6176e3d796db6a0d75b9388691a1b1c..4f5b716570e8e235699c90b44ce14b367469e994 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7192,7 +7192,6 @@ if (!is_fuchsia) { +@@ -7190,7 +7190,6 @@ if (!is_fuchsia) { deps += [ "//chrome:other_version", @@ -57,7 +57,7 @@ index b7f6d03040572623d3cad7aab3e376bbf2f6cb06..a3d3ada8e38f82b4874b0d907e14e75c "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -7213,6 +7212,10 @@ if (!is_fuchsia) { +@@ -7211,6 +7210,10 @@ if (!is_fuchsia) { "//ui/resources", ] @@ -68,7 +68,7 @@ index b7f6d03040572623d3cad7aab3e376bbf2f6cb06..a3d3ada8e38f82b4874b0d907e14e75c ldflags = [ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", -@@ -8232,7 +8235,6 @@ if (!is_fuchsia) { +@@ -8231,7 +8234,6 @@ if (!is_fuchsia) { } deps += [ @@ -76,7 +76,7 @@ index b7f6d03040572623d3cad7aab3e376bbf2f6cb06..a3d3ada8e38f82b4874b0d907e14e75c "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service:app_registry_cache_waiter", -@@ -8325,6 +8327,10 @@ if (!is_fuchsia) { +@@ -8324,6 +8326,10 @@ if (!is_fuchsia) { "//ui/webui/resources/js/browser_command:mojo_bindings", ] diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index eb981fffbd55e..76b6f73a7a0d9 100644 --- a/patches/chromium/can_create_window.patch +++ b/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 2b61af0a7453bced2fc476ca835f8924304a90d6..b16b3aabb38b5d992de01d5a6d0ab713fc175fd8 100644 +index 980582453b8b269b75fde409cdf0101809097a74..6f5076ea646d356946c4789143fdbec538150051 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8243,6 +8243,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -8225,6 +8225,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,7 +21,7 @@ index 2b61af0a7453bced2fc476ca835f8924304a90d6..b16b3aabb38b5d992de01d5a6d0ab713 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b697613172afdd75ba76fe882aa824395edeb95f..fef61b66b4151779ef5b3ea5e51c6278251263d4 100644 +index c9222aedf46fce9cd5ba332825dd832da730caa9..38b5a462873a48d37ea11b1a3d41da46ef63284a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4497,6 +4497,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -66,10 +66,10 @@ index ecdc75ae7888096922fb1ae1c86e9b80595d6570..feb8f08b44568f2c09359c8f3ec343fd // 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 ab03f01748f9784c2b4831476b3c9af79b8718e3..4f2cbca4fad52ba7d7d68b8e57e7a366d9573369 100644 +index e7127ba48f8508a42cdfd9aabf88c353739419ea..39114bd91b4589a66544dd6aee579bc9dde79c7f 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -725,6 +725,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -709,6 +709,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -79,10 +79,10 @@ index ab03f01748f9784c2b4831476b3c9af79b8718e3..4f2cbca4fad52ba7d7d68b8e57e7a366 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 ae2bcf19f154d08f655bc8e3f6393bd137fd921d..e176f11b94790d3dd92e8a2138f3fd21f4b13910 100644 +index 8d975e6cd75caedcbd5a276618c29867467a50c8..51cf95131a2637e5fd4ff2b22a258231db9e1528 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -181,6 +181,7 @@ class NetworkService; +@@ -182,6 +182,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -90,7 +90,7 @@ index ae2bcf19f154d08f655bc8e3f6393bd137fd921d..e176f11b94790d3dd92e8a2138f3fd21 } // namespace network namespace sandbox { -@@ -1182,6 +1183,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1160,6 +1161,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -148,10 +148,10 @@ index 4b32bf8ccc4ed370e2d1a218ae1fd69a98e23636..b9168a2488f5c4977eba5856882b561e // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 65d6ae137bafb073476aad0e536c66cc95184251..5f303065e7e14925e21b6491da61682c1450dd8d 100644 +index f9d31235bebe8855b8f7698f9c0d3a1d92f77303..7697bf80f0c5ce35fae8eb015f8295cbbb384784 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6555,6 +6555,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6556,6 +6556,10 @@ WebView* RenderFrameImpl::CreateNewWindow( request.HasUserGesture(), GetWebFrame()->IsAdFrame(), GetWebFrame()->IsAdScriptInStack()); @@ -163,10 +163,10 @@ index 65d6ae137bafb073476aad0e536c66cc95184251..5f303065e7e14925e21b6491da61682c // moved on send. bool is_background_tab = diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc -index ec5ad5ca26d2126cfcd80d764b7c1dff5c2d4543..337ba3710c757cf42af7869fef6faa3ae8473610 100644 +index bb2a4c21374db039eeb7ed10722933b155cdf486..00a117d18b69180ece2b1b65f92aad02ef045a86 100644 --- a/content/web_test/browser/web_test_content_browser_client.cc +++ b/content/web_test/browser/web_test_content_browser_client.cc -@@ -507,6 +507,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -512,6 +512,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -176,10 +176,10 @@ index ec5ad5ca26d2126cfcd80d764b7c1dff5c2d4543..337ba3710c757cf42af7869fef6faa3a bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h -index 1f8bcc18bbc249522c790439e004f5706a5ae84c..a6658fd65ef553c84d5f7ee04991cfeac36709c3 100644 +index cc7eb097097e44a0538853c46bb19810eb5a076c..74ecd32f27cd5e1ead4ab507d2b68a1088ba827f 100644 --- a/content/web_test/browser/web_test_content_browser_client.h +++ b/content/web_test/browser/web_test_content_browser_client.h -@@ -85,6 +85,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { +@@ -88,6 +88,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 794da22ed5de9..5b2ba938ae0d0 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -52,7 +52,7 @@ index 8309281d321256e118e7086b29692f63be6aa9e6..96c433b8a3a42bf477c6467595b58a50 /*from_user_gesture=*/true); return true; diff --git a/chrome/browser/ui/ash/ash_web_view_impl.h b/chrome/browser/ui/ash/ash_web_view_impl.h -index cfa7d6f8eeba0484a6e06a0ee8200bf5870cb9be..954ee85cc2307e812889cf8dd3980f2b07f6311f 100644 +index f47e14bc5dda6b84d1ae63148d7ee3bfb4797eb7..74838fd3621fd1d271ce8e3b037b1c785dd05651 100644 --- a/chrome/browser/ui/ash/ash_web_view_impl.h +++ b/chrome/browser/ui/ash/ash_web_view_impl.h @@ -51,8 +51,7 @@ class AshWebViewImpl : public ash::AshWebView, @@ -218,7 +218,7 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6 void AddNewContents(content::WebContents* source, std::unique_ptr new_contents, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b62e7b83fab208b069006b1255bc24c28e34b5e6..7071ada887c5f4bc73bc3ec41dc77dadd290963d 100644 +index 038cef59809065f0a775e1a0282bfeb9f31a4551..8baab27c7bc1bd7e0bbc6342388327a33304f713 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -4403,8 +4403,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch index 2a6dfbd790e60..a993132b4d4b8 100644 --- a/patches/chromium/command-ismediakey.patch +++ b/patches/chromium/command-ismediakey.patch @@ -87,7 +87,7 @@ index 943168e2c72c0aeb59f1ea21b14f2dc8e6cfd7e0..db3ca2ed0ba0994caa4d26436b942166 // Create an observer that registers a hot key for |accelerator|. std::unique_ptr observer = diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index 9057dbf62e6270707924e8f842d81545bae86d08..aa21320061131a051f1393e2a71181fd49d1d938 100644 +index 5703755f3468b579c3e26245928ded023b83be14..8bc58dd31b5822682fe13ad7ded1dc40892b296d 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc @@ -395,6 +395,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() { diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch index c5cc56bd8a363..9ef5032a260ca 100644 --- a/patches/chromium/crash_allow_setting_more_options.patch +++ b/patches/chromium/crash_allow_setting_more_options.patch @@ -116,7 +116,7 @@ index eb5bcfe0234c39526d6d162434476fe9e32d8184..8480d07e2607eb3c8c16b54a02077c04 arguments.push_back("--monitor-self"); } diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc -index 9ab5fb1c822752854fc88ba0ee3d24ddca4dd107..11ae602ccc58cb2728911b28d6637079d2dcb359 100644 +index 15addd5c5e6635ad3b5797d5986c79353590a583..f31ae6b9e8bfdcc32239d0f6859e29ea6b4112b1 100644 --- a/components/crash/core/app/crashpad_win.cc +++ b/components/crash/core/app/crashpad_win.cc @@ -91,6 +91,7 @@ bool PlatformCrashpadInitialization( diff --git a/patches/chromium/custom_protocols_plzserviceworker.patch b/patches/chromium/custom_protocols_plzserviceworker.patch index f1392c944028e..7e9454efaf882 100644 --- a/patches/chromium/custom_protocols_plzserviceworker.patch +++ b/patches/chromium/custom_protocols_plzserviceworker.patch @@ -8,7 +8,7 @@ Allow registering custom protocols to handle service worker main script fetching Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc -index 23955d2aa239c99afa71de5a8d66d35aa58e40ac..f6cafa8d1490aa8f7300e29a29dea1f3eaafcd3b 100644 +index 0d4098dda205475c75bf57706282f1118e6a0deb..075c91b22901ed5f6c9cc341ac22bf6fb9567319 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.cc +++ b/content/browser/service_worker/service_worker_context_wrapper.cc @@ -1916,6 +1916,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest( diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index c56dae50b18fd..87e7f6cbbb49f 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -81,10 +81,10 @@ index e4deb71ea3afa1ef9d6ddac9c61f5916ff608514..d2e6854ac2aaa3cc83c0b72ebc03193b !command_line->HasSwitch(switches::kUIDisablePartialSwap); diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 53e23c2b791b9f8851ecac455c3adefd8fc37688..857b648acf17742e7d904ece93ee113f4dc553b6 100644 +index 8f305d8563d8ce23d372decba75ee918e917d3aa..7550a286cb3cbc10680dcc37f840c9861ec3b9df 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc -@@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( +@@ -229,6 +229,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( // Command-line switches to propagate to the GPU process. static const char* const kSwitchNames[] = { @@ -93,10 +93,10 @@ index 53e23c2b791b9f8851ecac455c3adefd8fc37688..857b648acf17742e7d904ece93ee113f sandbox::policy::switches::kGpuSandboxAllowSysVShm, sandbox::policy::switches::kGpuSandboxFailuresFatal, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 0fa0effecebf1437181c02e477762ef4f33e9aaf..36351f2c0d82d7ffc9c03e8d9ca043652cab7fb6 100644 +index 73cad457ad37cfdb5459c11e7828a543dc0cf31d..49429659b2e9cb63314baa5b724105ebeeb4a7a0 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3362,6 +3362,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3387,6 +3387,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( // Propagate the following switches to the renderer command line (along // with any associated values) if present in the browser command line. static const char* const kSwitchNames[] = { diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index e66e570059d53..0ad1e7de0479d 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm -index fae7865cda633ae96df60b2d8d6beb1384031969..e0a3dbccbab10f7936910fc131750f6fbc56b00e 100644 +index 1c89ef6bfe1ad78e0f7d25135619f481746c75b6..c47deb8e53151c63ee26456eefbd910b1b64d70d 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -557,7 +557,11 @@ diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 0727d47ef7c93..0652b87ef67ab 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ 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 5e850dda31f4780a11964b1feb4f5aff63e10da2..f3955c5e0c491df9cf4d42ca8908e6986256e7cf 100644 +index d0a020a094132003e443b7a544d737615d4864e0..f15ba3475d6733bf33f1d3d243773928c29dd776 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -832,6 +832,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -20,7 +20,7 @@ index 5e850dda31f4780a11964b1feb4f5aff63e10da2..f3955c5e0c491df9cf4d42ca8908e698 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 2c8dfa25d5a02a48add86fc0fde9b8bd433bb165..44a5d8d20e7885fb249377cd3fe3c5e0bee24266 100644 +index c341d381d44d92040f876d7964eaa7b35135a750..ab7b311760b331144fb525e10ced812e9942b3da 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -914,6 +914,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch index 56f4f3f155807..3f6d0b4767f5b 100644 --- a/patches/chromium/disable_unload_metrics.patch +++ b/patches/chromium/disable_unload_metrics.patch @@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we should continue seeking for a real fix. diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc -index 607f7aa461ac881f1fe83e6c37092993231f145b..f3c4d0e78e352f32b3c3cb179327909e750826f4 100644 +index 5bf90893c11b6ba9bceecefa2774a48e1b75c84a..bb41e1ca654c85d0e534227f8f51a55825c661ac 100644 --- a/content/browser/renderer_host/navigator.cc +++ b/content/browser/renderer_host/navigator.cc -@@ -1305,6 +1305,7 @@ void Navigator::RecordNavigationMetrics( +@@ -1282,6 +1282,7 @@ void Navigator::RecordNavigationMetrics( .InMilliseconds()); } @@ -35,7 +35,7 @@ index 607f7aa461ac881f1fe83e6c37092993231f145b..f3c4d0e78e352f32b3c3cb179327909e // If this is a same-process navigation and we have timestamps for unload // durations, fill those metrics out as well. if (params.unload_start && params.unload_end && -@@ -1354,6 +1355,7 @@ void Navigator::RecordNavigationMetrics( +@@ -1331,6 +1332,7 @@ void Navigator::RecordNavigationMetrics( first_before_unload_start_time) .InMilliseconds()); } diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index 22bd53e160886..b5232d9b46d9d 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/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 a17b1a681e7473190c010db528d1ce4b24af876a..56ab055a6022fee0177e43bfc9d5be2cb76a6939 100644 +index c3d269712d75d0982302cedd2fc3a23973498fa9..cdb50603a942e4285eebae3cac84da22752bea70 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -1525,6 +1525,13 @@ void NetworkContext::SetNetworkConditions( diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index ac0bc2d340020..40ca54cec5038 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/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 26297bd0f723b3d62a4fc1b2a5ba5a214e15488b..9f05b6a81590c6a4168d70dfbb2ac6f5ee039ab3 100644 +index a6714774b3fd35c0f34f37ab27163bfc920a8212..0550bf54088ba18311ea13cea1555d22e2976a20 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -167,6 +167,7 @@ @@ -23,7 +23,7 @@ index 26297bd0f723b3d62a4fc1b2a5ba5a214e15488b..9f05b6a81590c6a4168d70dfbb2ac6f5 #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" -@@ -1798,6 +1799,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, +@@ -1796,6 +1797,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, #if BUILDFLAG(IS_MAC) web_view_impl->SetMaximumLegibleScale( prefs.default_maximum_page_scale_factor); diff --git a/patches/chromium/feat_configure_launch_options_for_service_process.patch b/patches/chromium/feat_configure_launch_options_for_service_process.patch index 4f1526e33fc69..143ade7b44976 100644 --- a/patches/chromium/feat_configure_launch_options_for_service_process.patch +++ b/patches/chromium/feat_configure_launch_options_for_service_process.patch @@ -110,19 +110,19 @@ index 9e5365dc37489dcd9f94d23cf03713492ab20e5f..03206ccc3181eae7776b4f2c076285b8 } diff --git a/content/browser/child_process_launcher_helper_win.cc b/content/browser/child_process_launcher_helper_win.cc -index 57f3ac588c98c3a3ec0857c7f0d60c3bce0e32a1..707e878379b337b1ef22bb9675aad4fabcf453bd 100644 +index e5c96c7e5fada31994754679115f5e7b703b3ad4..e1bbce4ed643827c2ce2e841fae4d09cdff4dff3 100644 --- a/content/browser/child_process_launcher_helper_win.cc +++ b/content/browser/child_process_launcher_helper_win.cc -@@ -19,6 +19,8 @@ +@@ -21,6 +21,8 @@ #include "sandbox/policy/win/sandbox_win.h" #include "sandbox/win/src/sandbox_types.h" +#include + - namespace content { - namespace internal { + namespace { -@@ -58,6 +60,30 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( + // /prefetch:# arguments to use when launching various process types. It has +@@ -190,6 +192,30 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( mojo_channel_->PrepareToPassRemoteEndpoint(&options->handles_to_inherit, command_line()); } @@ -153,7 +153,7 @@ index 57f3ac588c98c3a3ec0857c7f0d60c3bce0e32a1..707e878379b337b1ef22bb9675aad4fa return true; } -@@ -85,7 +111,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( +@@ -217,7 +243,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( ChildProcessLauncherHelper::Process process; *launch_result = StartSandboxedProcess(delegate_.get(), *command_line(), @@ -183,10 +183,10 @@ index 01e62d7e8df65efb900e9cd0d34bcd8e0ed3e7da..9af6784707f125046d9a734165fc2b08 host->GetChildProcess()->BindServiceInterface(std::move(receiver)); } diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc -index b9ddc82c767c5641b0d8b0166fa181148aea4de7..c6f8418eeddfe8f95927afbe6e034511e3df1011 100644 +index db744a552e0147ebcf3b162f9017de3a5c8f6c66..2f56433f44a425f645120271c4e39e8e4447e3bb 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc -@@ -157,11 +157,13 @@ const ChildProcessData& UtilityProcessHost::GetData() { +@@ -180,11 +180,13 @@ const ChildProcessData& UtilityProcessHost::GetData() { return process_->GetData(); } @@ -202,7 +202,7 @@ index b9ddc82c767c5641b0d8b0166fa181148aea4de7..c6f8418eeddfe8f95927afbe6e034511 bool UtilityProcessHost::Start() { return StartProcess(); -@@ -227,6 +229,24 @@ void UtilityProcessHost::SetZygoteForTesting(ZygoteCommunication* handle) { +@@ -250,6 +252,24 @@ void UtilityProcessHost::SetZygoteForTesting(ZygoteCommunication* handle) { } #endif // BUILDFLAG(USE_ZYGOTE) @@ -227,7 +227,7 @@ index b9ddc82c767c5641b0d8b0166fa181148aea4de7..c6f8418eeddfe8f95927afbe6e034511 mojom::ChildProcess* UtilityProcessHost::GetChildProcess() { return static_cast(process_->GetHost()) ->child_process(); -@@ -445,9 +465,22 @@ bool UtilityProcessHost::StartProcess() { +@@ -468,9 +488,22 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch index 96704b1b1b28d..040b718c7cbde 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -112,7 +112,7 @@ index 5803d57c1c85f219a1ee4675d1fc4bb0c5ee81d0..880d360cfd58f368eafbabd8c3abdb36 string mime_type; diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index f91b4acdf8da956909f2a51f9b2c065958f87f0c..fdf061bdf13948884dccb5c24f761bc32b82dbcd 100644 +index 8f5b717efcad8718328b018cc9afb229ee21821e..87c4c342355df9c5c7a5a01c095fc0d81365cb49 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc @@ -673,6 +673,7 @@ URLLoader::URLLoader( @@ -132,7 +132,7 @@ index f91b4acdf8da956909f2a51f9b2c065958f87f0c..fdf061bdf13948884dccb5c24f761bc3 url_request_->SetResponseHeadersCallback(base::BindRepeating( &URLLoader::SetRawResponseHeaders, base::Unretained(this))); } -@@ -1647,6 +1648,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { +@@ -1653,6 +1654,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { } response_ = BuildResponseHead(); diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 949c26be90616..ddf28734f7c84 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch @@ -40,10 +40,10 @@ index 2e5436d271df7df7e8f5fc8efbc85cc77bff9a36..a9365d7cf288fa16651ab6a2165803ec // 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 04fa9442702437258e0de5a3a6910c9b2295d083..7fbb20f0e8e4f34d1fb6e112002fd29466af5c34 100644 +index 99df2c18b6b41e32e7aa25f326b826ff262fda35..7d1cc22d5aebaf259324a1076e2515b59680c064 100644 --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -2125,6 +2125,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { +@@ -2126,6 +2126,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { scoped_refptr DocumentLoader::CalculateOrigin( Document* owner_document) { scoped_refptr origin; @@ -54,7 +54,7 @@ index 04fa9442702437258e0de5a3a6910c9b2295d083..7fbb20f0e8e4f34d1fb6e112002fd294 StringBuilder debug_info_builder; if (origin_to_commit_) { // Origin to commit is specified by the browser process, it must be taken -@@ -2172,6 +2176,10 @@ scoped_refptr DocumentLoader::CalculateOrigin( +@@ -2173,6 +2177,10 @@ scoped_refptr DocumentLoader::CalculateOrigin( debug_info_builder.Append(", url="); debug_info_builder.Append(owner_document->Url().BaseAsString()); debug_info_builder.Append(")"); diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch index 275a047a6da2d..a6f4f0bec043d 100644 --- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch +++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch @@ -59,7 +59,7 @@ index f96af14cb915c8ab92b314ac15b6dffcdd6ec607..2556abe433493251ebd48d4aeddaa6d4 // true if register successfully, or false if 1) the specificied |accelerator| // has been registered by another caller or other native applications, or diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index aa21320061131a051f1393e2a71181fd49d1d938..6be700f632e9f8732bee726b8c4c3d39787fca60 100644 +index 8bc58dd31b5822682fe13ad7ded1dc40892b296d..1811361f25fd8276c317e4fcd883e998af8aeab8 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc @@ -86,7 +86,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey( diff --git a/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch b/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch index 53bcd8706ad5f..f30ac44057a5c 100644 --- a/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch +++ b/patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch @@ -160,10 +160,10 @@ index 5b3deb74d3e1cceebfd86a8f4bacf81a10967ade..8ca4f8d8fd6353177ae203e3c4c0810a std::unique_ptr occlusion_tracker_; #endif //! BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index 9c878b85a1ac1e163d46d77ddc5e6ab0fafb52c4..60f241c2d3234446b514860377209920691098c5 100644 +index b3419d2bb60ab0488fc0413843c33b5a926fee09..059754d92621ada9100e739ee6b5db01ae9ea75f 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -@@ -309,11 +309,13 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -314,11 +314,13 @@ std::unique_ptr VideoOverlayWindowViews::Create( } #endif // BUILDFLAG(IS_WIN) diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index 41bdafddfd0bc..6b4cef6a961e4 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -45,7 +45,7 @@ index e340087e3ab2f07937ed6e6bd8e0ec8aa2a76d48..2b29e246b2f6ecf5d7605abfa3602864 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 5adeba5c2286b7914355d6e7aa5502c55ac3160d..85225b3667d9bc4c40896173d7291b7ac6d02ea0 100644 +index a2e8526344318df726ea3af130aab3f72a3125e1..35b1cdcd9099bac3fd926ab6c9587dc5597c0d7d 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -8645,7 +8645,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( diff --git a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch index 7d6199eab3012..e7780036339fe 100644 --- a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch +++ b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch @@ -11,7 +11,7 @@ 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 ff3d1d4b581512b01bfb82be4c4fc567b2fe636f..cf7fcafe8d1d5cb6307d3488eed267a52e5667c6 100644 +index 6e1cf587c7cd1b406b8f6488f4a7f309476f11a8..18e6f21bbec999a3bdbf9ad10690ba3437f1830f 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2215,9 +2215,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index f06a6622c8d85..311ee64b5e9cb 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,10 +20,10 @@ index 7c85f3e5bdee4797da773219404fd9b1bc9f529a..b979d6b567024aa7fc2945e86da8c613 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index e176f11b94790d3dd92e8a2138f3fd21f4b13910..69eb12bf5a22298c01bc6cbfb9773088d6313458 100644 +index 51cf95131a2637e5fd4ff2b22a258231db9e1528..6a2b96de99317d6a0f9f4f7d89293541106611c3 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -320,6 +320,11 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -298,6 +298,11 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ~ContentBrowserClient() = default; diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch index b76df5fd74ba6..3c13187f990a0 100644 --- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch +++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch @@ -11,10 +11,10 @@ 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 bf5dfc3693cab1386aceab981f954c7372d35d58..3fbd1f880eee78f1c8025965d0220ea57c7b3530 100755 +index 47835edabbf4ea89942fa54987982c3479ca2793..13d8aec7c907cf925912dc0981dd63de45bd5fc0 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py -@@ -307,6 +307,8 @@ def GetDefaultHostOs(): +@@ -306,6 +306,8 @@ def GetDefaultHostOs(): 'win32': 'win', } default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform) diff --git a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch index d1cb9b3ca5806..b7fe4bcdc92d2 100644 --- a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch +++ b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch @@ -9,7 +9,7 @@ at rutime. It would be best if eventually all usages of this property were replaced with clean ozone native implementations. diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc -index 62382a2fb818f42cbf64cd1d18b96f4333df67fd..84cdeb49946871161d321abe8fab5bae63a16e3a 100644 +index 3409429c7bbe0ac0960564c69d613e0cfa853765..ea48ed5231b5e01a72cd18ff3bd4058cef4ba81d 100644 --- a/ui/ozone/platform/x11/ozone_platform_x11.cc +++ b/ui/ozone/platform/x11/ozone_platform_x11.cc @@ -193,6 +193,7 @@ class OzonePlatformX11 : public OzonePlatform, @@ -21,7 +21,7 @@ index 62382a2fb818f42cbf64cd1d18b96f4333df67fd..84cdeb49946871161d321abe8fab5bae properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h -index 29ff7bf5229de4fc71d48bbacb99cf6721032a4f..59c0e7c009328a0f43ea1e6da1527e0cba023f37 100644 +index 21b4bceb3b7fcf191d4a4c0805823969e7ca99e4..f0cbb0ae08f6d0bc837c21c259ec5613e2ce62f6 100644 --- a/ui/ozone/public/ozone_platform.h +++ b/ui/ozone/public/ozone_platform.h @@ -124,6 +124,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 78a5cecc79286..48abde6545a88 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,10 +35,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index ff71625d3745fe7a667642bb06579febb5ea4a6b..0f7bab84e53a5b9a5c9e6b312806d90d84c10069 100644 +index ccbf80dcc16734d1f8fd4f8bb574dd4534f3e7c4..3c07d4c27bdf22986e4d832cc36da573db4cfbc4 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1037,6 +1037,7 @@ component("base") { +@@ -1038,6 +1038,7 @@ component("base") { "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", @@ -390,7 +390,7 @@ index 12f99e2640142c922944d7101633a4e75baa4a92..27b8d9c767ca3f4dede7f79d6295ec8c if (is_win) { diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm -index 76be676717e62c429319338c6115be89f2dfa424..18a5fd3c87b08c95d668b70c9b8f7a76413a75bb 100644 +index eaf077d33ca54a5394b1f1ab9024b22c4e496ae5..ac2b42196188bc32b9842f95df74aa4ca8ed54ae 100644 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm @@ -86,8 +86,10 @@ id GetFocusedBrowserAccessibilityElement() override { @@ -405,7 +405,7 @@ index 76be676717e62c429319338c6115be89f2dfa424..18a5fd3c87b08c95d668b70c9b8f7a76 void ForwardKeyboardEvent(const content::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 14a52ca1254d4b583b44c20336cce1637b91f88c..618b9a6d680a2bfaf26ad3c7303a95081ccdb75b 100644 +index 8c32ab0c35f68ae57f93002455a979f9381e3ac6..77782bb1847baf847d53e9bea926316c36f92838 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 @@ -2020,15 +2020,21 @@ - (NSAccessibilityRole)accessibilityRole { @@ -431,7 +431,7 @@ index 14a52ca1254d4b583b44c20336cce1637b91f88c..618b9a6d680a2bfaf26ad3c7303a9508 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 79a279f732958b835f3fad6522a529d0c2561653..17011d3172f03b34447be0ae12b88212e1c4041d 100644 +index e67304f208e1ad657fff4b9c958fba4e74b75bf4..62695d9439c28ef29a18999909ae9c5fc442181a 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -53,6 +53,7 @@ source_set("browser") { @@ -515,7 +515,7 @@ index 04033ad13703e6e2a96ac3eec298c778c52512a1..24eb6f80dd31c55af90153dccd3b450e // Used to force the NSApplication's focused accessibility element to be the // content::BrowserAccessibilityCocoa accessibility tree when the NSView for diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm -index 0f1bc6f3804309f513cbc700cc10e8b173a68dc0..fae7865cda633ae96df60b2d8d6beb1384031969 100644 +index 816e03b7a9c8d3dd1ca7ec2dc354a02e9b03a2f0..1c89ef6bfe1ad78e0f7d25135619f481746c75b6 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -272,8 +272,10 @@ @@ -568,10 +568,10 @@ index 0f1bc6f3804309f513cbc700cc10e8b173a68dc0..fae7865cda633ae96df60b2d8d6beb13 /////////////////////////////////////////////////////////////////////////////// diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 8e1115c6b2d259ca8d8fb163f6d8fa020a46ae31..b801ab4a2349867f53ba7abbd9974d5238c5ec75 100644 +index 3c5d755932014bc28cd1ced41a49bd8c920c93b0..a15ed2cee75e5a82a3e43457c77471735e4c0fa2 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -235,6 +235,7 @@ source_set("common") { +@@ -238,6 +238,7 @@ source_set("common") { "//content:content_implementation", "//build/config:precompiled_headers", ] @@ -660,10 +660,10 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019 } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab68943e5d0f6 100644 +index 39fbfa15fb71497baa79e2989a1bafc87fa83fd4..0b71495e29c2d8fd512110ae416c277075ecd168 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -474,6 +474,7 @@ static_library("test_support") { +@@ -475,6 +475,7 @@ static_library("test_support") { configs += [ "//build/config:precompiled_headers", "//v8:external_startup_data", @@ -671,7 +671,7 @@ index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab689 ] public_deps = [ -@@ -1049,6 +1050,7 @@ static_library("browsertest_support") { +@@ -1050,6 +1051,7 @@ static_library("browsertest_support") { } configs += [ "//v8:external_startup_data" ] @@ -679,7 +679,7 @@ index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab689 } mojom("content_test_mojo_bindings") { -@@ -1668,6 +1670,7 @@ test("content_browsertests") { +@@ -1670,6 +1672,7 @@ test("content_browsertests") { defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] configs += [ "//build/config:precompiled_headers" ] @@ -687,7 +687,7 @@ index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab689 public_deps = [ ":test_interfaces", -@@ -2909,6 +2912,7 @@ test("content_unittests") { +@@ -2912,6 +2915,7 @@ test("content_unittests") { } configs += [ "//build/config:precompiled_headers" ] @@ -696,7 +696,7 @@ index a086b61f92cc113b74057c6f9adf8e297040f6e4..4ed4a7d3edaed95e89cd33783e6ab689 public_deps = [ "//content:content_resources" ] diff --git a/content/web_test/BUILD.gn b/content/web_test/BUILD.gn -index fadba8ec22728d9b99e6042438039b3c8a88b836..3cf1ab8200f7ff18d4ef1e5678579ce8af7072fa 100644 +index 38e5fd5c3af79a9f0ed80b2e15d748e9144b7982..508816a935744166cbc15561de07d7e77a1f68af 100644 --- a/content/web_test/BUILD.gn +++ b/content/web_test/BUILD.gn @@ -149,6 +149,8 @@ static_library("web_test_browser") { @@ -849,7 +849,7 @@ index 9c4e8e2536819610648aa5b3d11eaa5d2da24a9c..0b3660e51b0a15102b7b1726e17b34d5 ca_layer_tree_coordinator_->GetIOSurfaceForDisplay(); if (io_surface) { diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn -index 6ab4e755d5d7a82685424118c21ded35924c611c..65022e5613c275883b6578662492a9f761ee7294 100644 +index 878a23986aa6c2bc3db8943c2a25414efdae51b4..d5d1d657faea0d949a47f1d2d5d07d2a73353f38 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -209,6 +209,7 @@ source_set("audio") { @@ -861,10 +861,10 @@ index 6ab4e755d5d7a82685424118c21ded35924c611c..65022e5613c275883b6578662492a9f7 if (is_ios) { diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc -index 5800426da595f05e95f914371b2174bdff779ac1..7784d60f801282651cf840d90e7e9bf8dc015b96 100644 +index a21d4afac7ed2e17d6d31255be381b465de70e5b..00556993be4176b921be59dad57a5b0dff2e0da1 100644 --- a/media/audio/mac/audio_low_latency_input_mac.cc +++ b/media/audio/mac/audio_low_latency_input_mac.cc -@@ -31,19 +31,23 @@ +@@ -33,19 +33,23 @@ namespace { extern "C" { @@ -886,8 +886,8 @@ index 5800426da595f05e95f914371b2174bdff779ac1..7784d60f801282651cf840d90e7e9bf8 } +#endif } - } // namespace + #endif diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 473162885a2249cbc9b20bd810de95f54f0876f7..2fb15fcb7a04bfff01d7a22e79d467ba946b37d8 100644 --- a/media/audio/mac/audio_manager_mac.cc @@ -1278,7 +1278,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 3475f873f2e8f0b654dfb27df911507575c2645b..8162ffa9ee446312bb16fe66e8ea7e601f3028bc 100644 +index d9349048bd9f0dbf4058a0085211c31140fd8818..58b32362c3c6821257ca93311b8e3d54281f570b 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -312,6 +312,7 @@ component("core") { diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index e069c58db3ea5..6dbf35f77e64a 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/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 04dbde365bd0585d9a63dc3a696626817257ab64..a17b1a681e7473190c010db528d1ce4b24af876a 100644 +index dc72b9420d81824b01448f862f300877c762e5c5..c3d269712d75d0982302cedd2fc3a23973498fa9 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -146,6 +146,11 @@ diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 65160207f96b9..9bd0f3529f6f8 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -133,10 +133,10 @@ index 1dc5478b8d0787a1cc82dc9fcb0227fed3f583c2..9a76f675ccdd4b173afa65aa05b733d4 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 d010f57377a35e5804ff95767284de1a702da0b1..30ad86a1f570b92a46221f572320696b4f17a764 100644 +index 552b65924a415df32bffca6d2518cc76bce0505f..23c2f323ce9172d6e8a42d0cc031da5a0540ce35 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -2035,7 +2035,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2041,7 +2041,7 @@ void RenderProcessHostImpl::CreateNotificationService( case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker: case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: { storage_partition_impl_->GetPlatformNotificationContext()->CreateService( @@ -145,7 +145,7 @@ index d010f57377a35e5804ff95767284de1a702da0b1..30ad86a1f570b92a46221f572320696b creator_type, std::move(receiver)); break; } -@@ -2043,7 +2043,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2049,7 +2049,7 @@ void RenderProcessHostImpl::CreateNotificationService( CHECK(rfh); storage_partition_impl_->GetPlatformNotificationContext()->CreateService( diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch index 04ebf1b2d0c87..fbaae93e7e20b 100644 --- a/patches/chromium/picture-in-picture.patch +++ b/patches/chromium/picture-in-picture.patch @@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent because we don't generate them in our build. diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc -index af0616d9ca466d146f3c41887857dd4720ebafbf..c088db193f5bd4b88aa42a3803571d2b87251b76 100644 +index 1a0c7f5f204f00b52747ebb7800b39a3479f1178..52a1b350c8b5a13b4c0636b43f4773b72872f025 100644 --- a/chrome/browser/ui/views/overlay/close_image_button.cc +++ b/chrome/browser/ui/views/overlay/close_image_button.cc @@ -4,11 +4,14 @@ @@ -40,7 +40,7 @@ index af0616d9ca466d146f3c41887857dd4720ebafbf..c088db193f5bd4b88aa42a3803571d2b ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground, kCloseButtonIconSize)); diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index 19b3ac41fae0e18412f21f9efba5a656f536e7f8..9c878b85a1ac1e163d46d77ddc5e6ab0fafb52c4 100644 +index 8f486ad5ce3862038dc749148044876fbc7e9da2..b3419d2bb60ab0488fc0413843c33b5a926fee09 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -17,9 +17,11 @@ @@ -64,7 +64,7 @@ index 19b3ac41fae0e18412f21f9efba5a656f536e7f8..9c878b85a1ac1e163d46d77ddc5e6ab0 #include "chrome/browser/shell_integration_win.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" -@@ -287,7 +289,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -292,7 +294,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( overlay_window->Init(std::move(params)); overlay_window->OnRootViewReady(); diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index ee765e23040a7..c960db29261db 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -11,7 +11,7 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. diff --git a/BUILD.gn b/BUILD.gn -index cc7a8dd70c6353dda6a07a1cd1c9d4d9b8967171..c5032786f8187163001a83e636854c7a9c743126 100644 +index 2fafbb88224a6290733379631a08e5e20b08218d..81bc36fa8525d6b7dd9482284553fc67a403c4b1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -966,7 +966,6 @@ if (is_win) { @@ -829,10 +829,10 @@ index 3cf735c0bf3ba4ed4a871f4608f43cf9767de62f..fccabc0c51ba2fc1ccd8646d30da782f // Calculate number of pages in source document. uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame, diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 17011d3172f03b34447be0ae12b88212e1c4041d..b79c4460d9c090ba585c38e15347fe6b50d41cdb 100644 +index 62695d9439c28ef29a18999909ae9c5fc442181a..09f92c1b1ff60783580d02c320e7a7a5bf417f0c 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2970,8 +2970,9 @@ source_set("browser") { +@@ -2963,8 +2963,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index c0d6d71d5709a..69a7ceccc129c 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,7 +30,7 @@ index c4255d8dfc2e3c4f1f32506e4e9edbb90a74340a..142398a8adafc94e6724ee750b612a66 // 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 f3955c5e0c491df9cf4d42ca8908e6986256e7cf..ff3d1d4b581512b01bfb82be4c4fc567b2fe636f 100644 +index f15ba3475d6733bf33f1d3d243773928c29dd776..6e1cf587c7cd1b406b8f6488f4a7f309476f11a8 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2141,6 +2141,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { @@ -44,7 +44,7 @@ index f3955c5e0c491df9cf4d42ca8908e6986256e7cf..ff3d1d4b581512b01bfb82be4c4fc567 void RenderWidgetHostImpl::ShowContextMenuAtPoint( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index fef61b66b4151779ef5b3ea5e51c6278251263d4..b62e7b83fab208b069006b1255bc24c28e34b5e6 100644 +index 38b5a462873a48d37ea11b1a3d41da46ef63284a..038cef59809065f0a775e1a0282bfeb9f31a4551 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -5109,6 +5109,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -60,10 +60,10 @@ index fef61b66b4151779ef5b3ea5e51c6278251263d4..b62e7b83fab208b069006b1255bc24c2 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 554e211dfc6683650fb8623f6dfff6935a16958a..bd7cfc7f3d86ecf978a1fcb443454e87bdbb363f 100644 +index 3ba96d4aede6844ac358074e145ae89373bb06d2..dcce544ee23fe7fe9ce0c6b1c89840aedb514f5f 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -1010,6 +1010,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -1011,6 +1011,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; void SendActiveState(bool active) override; TextInputManager* GetTextInputManager() override; diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch index abccd04c347f7..4c48caa26f019 100644 --- a/patches/chromium/render_widget_host_view_base.patch +++ b/patches/chromium/render_widget_host_view_base.patch @@ -24,17 +24,18 @@ index cfacbb911e5fd2cce13598cf4c2697e9d0c73038..114203c9fc5ff1ab82c80f478049ee47 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 67cb5cf0b9749f8488e307a4e0bd5ea3a0213db0..38b18aec9e3425f24e57cd71bb02093322acdd88 100644 +index 43531968500880d97911a7a777bd79a1f335681e..75fd40c7a484b923ff08a49367b407344d2cbae4 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h -@@ -25,9 +25,12 @@ +@@ -24,10 +24,13 @@ + #include "components/viz/common/surfaces/surface_id.h" #include "components/viz/host/hit_test/hit_test_query.h" #include "content/browser/renderer_host/display_feature.h" - #include "content/browser/renderer_host/input/input_router_impl.h" +#include "content/browser/renderer_host/visible_time_request_trigger.h" +#include "content/browser/web_contents/web_contents_view.h" #include "content/common/content_export.h" #include "content/common/input/event_with_latency_info.h" + #include "content/common/input/input_router_impl.h" #include "content/public/browser/render_frame_metadata_provider.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 9278dd20c8011..3f554233115be 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/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 fbe3b0e6acd82a286061bf8ab3547b22fa603e05..14a52ca1254d4b583b44c20336cce1637b91f88c 100644 +index 1b4d385ae5cc8355f019710f0c67716d95864535..8c32ab0c35f68ae57f93002455a979f9381e3ac6 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 @@ -159,6 +159,15 @@ void ExtractUnderlines(NSAttributedString* string, diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index a13a48ebdbf02..49bfe594e1662 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/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 7edafe2ef79313059c3e358c135272802c6db719..17de4f7e6afb6f4e31dd56c469c0cf4a0e0015f0 100644 +index 7c72b996ace8b4d5bef9788158061168ed20d201..64547996ba65e1f4385e3cfd322b170f1dc379bc 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1223,7 +1223,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { +@@ -1224,7 +1224,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 2aafe35e4f52c..7d017831f569b 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it does touch a security-sensitive class. diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 30ad86a1f570b92a46221f572320696b4f17a764..0fa0effecebf1437181c02e477762ef4f33e9aaf 100644 +index 23c2f323ce9172d6e8a42d0cc031da5a0540ce35..73cad457ad37cfdb5459c11e7828a543dc0cf31d 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -1712,9 +1712,15 @@ bool RenderProcessHostImpl::Init() { +@@ -1723,9 +1723,15 @@ bool RenderProcessHostImpl::Init() { std::unique_ptr sandbox_delegate = std::make_unique( *cmd_line, IsPdf(), IsJitDisabled()); diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 7568afdeb2193..cd5133323fb7f 100644 --- a/patches/chromium/web_contents.patch +++ b/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 7071ada887c5f4bc73bc3ec41dc77dadd290963d..c10d735a155c710435544ef885072d864ede1e3f 100644 +index 8baab27c7bc1bd7e0bbc6342388327a33304f713..9f31e9e72019b437cb7ec1865003f0416bea24cd 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3452,6 +3452,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index 1f811f264802b..7cf95b37989de 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/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 b16b3aabb38b5d992de01d5a6d0ab713fc175fd8..044c3057714ad79c0a7a4bd1ee374e6068ad8aa4 100644 +index 6f5076ea646d356946c4789143fdbec538150051..1e1ca5cd60436cb8901516ca32691e23edce6360 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -7435,6 +7435,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -7417,6 +7417,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } @@ -37,7 +37,7 @@ index b16b3aabb38b5d992de01d5a6d0ab713fc175fd8..044c3057714ad79c0a7a4bd1ee374e60 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 c10d735a155c710435544ef885072d864ede1e3f..5adeba5c2286b7914355d6e7aa5502c55ac3160d 100644 +index 9f31e9e72019b437cb7ec1865003f0416bea24cd..a2e8526344318df726ea3af130aab3f72a3125e1 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3706,21 +3706,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( diff --git a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch index 277246d52c7f7..cfbcc2911eafc 100644 --- a/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch +++ b/patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch @@ -46,7 +46,7 @@ index 6cdf53b19c7d058bb66b9fcbe745874cc48daa99..8d112008c2667db97ed5b5af3f87c40d V8_INLINE static void* GetAlignedPointerFromInternalField( const BasicTracedReference& object, int index) { diff --git a/src/api/api.cc b/src/api/api.cc -index a7ae86d05dafe42500df0cbbd7a956f35040a6b6..11d5e79c329aba8312e34b461582ecbf5e4d1890 100644 +index 03b7167437fb11968a780dfbff99d61a91c6046f..db2f9a777231505c83ac80ffebb618c99e24ed2f 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -6284,14 +6284,33 @@ Local v8::Object::SlowGetInternalField(int index) { From b8fd72f32fb03ccce5e3c3b7473bf7b92a0574db Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 10 Jan 2024 23:41:09 +1300 Subject: [PATCH 24/27] fix: remove --disable-color-correct-renderering Per https://electronhq.slack.com/archives/CB6CG54DB/p1698444047862459 it is not used any more and was never documented. --- docs/breaking-changes.md | 4 + patches/chromium/.patches | 1 - .../disable_color_correct_rendering.patch | 239 ------------------ 3 files changed, 4 insertions(+), 240 deletions(-) delete mode 100644 patches/chromium/disable_color_correct_rendering.patch diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md index 48fcacd5242a2..5800ffa181965 100644 --- a/docs/breaking-changes.md +++ b/docs/breaking-changes.md @@ -22,6 +22,10 @@ attribute in order to access them. See [documentation](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#allow) for more information. +### Removed: The `--disable-color-correct-rendering` switch + +This switch was never formally documented but it's removal is being noted here regardless. Chromium itself now has better support for color spaces so this flag should not be needed. + ## Planned Breaking API Changes (29.0) ### Behavior Changed: `ipcRenderer` can no longer be sent over the `contextBridge` diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 40a8fe97dab92..1ddb9f6d15680 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -32,7 +32,6 @@ worker_context_will_destroy.patch frame_host_manager.patch crashpad_pid_check.patch network_service_allow_remote_certificate_verification_logic.patch -disable_color_correct_rendering.patch add_contentgpuclient_precreatemessageloop_callback.patch picture-in-picture.patch disable_compositor_recycling.patch diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch deleted file mode 100644 index 87e7f6cbbb49f..0000000000000 --- a/patches/chromium/disable_color_correct_rendering.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Birunthan Mohanathas -Date: Fri, 30 Nov 2018 12:44:12 +0200 -Subject: disable_color_correct_rendering.patch - -This adds a --disable-color-correct-rendering switch. In Electron 2.0, -`--disable-features=ColorCorrectRendering` could be -used to make the app use the display color space (e.g. P3 on Macs) -instead of color correcting to sRGB. Because color correct rendering is -always enabled on Chromium 62 and later and because -`--force-color-profile` has no effect on macOS, apps that need e.g. P3 -colors are currently stuck on Electron 2.0. - -This restores the functionality removed in -https://chromium-review.googlesource.com/698347 in the form of the -`--disable-color-correct-rendering` switch. - -This can be removed once web content (including WebGL) learn how -to deal with color spaces. That is being tracked at -https://crbug.com/634542 and https://crbug.com/711107. - -diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index f7fa1ade7280d58bf5dfd66995c0075e03e43d69..c25a285c25fec2a9be6a95d04929467a3ed0d718 100644 ---- a/cc/trees/layer_tree_host_impl.cc -+++ b/cc/trees/layer_tree_host_impl.cc -@@ -1911,6 +1911,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( - TargetColorParams LayerTreeHostImpl::GetTargetColorParams( - gfx::ContentColorUsage content_color_usage) const { - TargetColorParams params; -+ if (!settings_.enable_color_correct_rendering) { -+ params.color_space = gfx::ColorSpace(); -+ return params; -+ } - - // If we are likely to software composite the resource, we use sRGB because - // software compositing is unable to perform color conversion. -diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h -index e43b58e7458336f914662d026a24e774fbe647ba..68c8f235f6afb412ebc65604c7b39109d9842d23 100644 ---- a/cc/trees/layer_tree_settings.h -+++ b/cc/trees/layer_tree_settings.h -@@ -101,6 +101,8 @@ class CC_EXPORT LayerTreeSettings { - bool use_rgba_4444 = false; - bool unpremultiply_and_dither_low_bit_depth_tiles = false; - -+ bool enable_color_correct_rendering = true; -+ - // If set to true, the compositor may selectively defer image decodes to the - // Image Decode Service and raster tiles without images until the decode is - // ready. -diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h -index 66564fbc928d28af97d7afaa2cfea03ce7ebc04c..cdd32d25eab50cbc2910f92eca92b9f6c8c7b5fe 100644 ---- a/components/viz/common/display/renderer_settings.h -+++ b/components/viz/common/display/renderer_settings.h -@@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings { - RendererSettings(const RendererSettings& other); - ~RendererSettings(); - -+ bool enable_color_correct_rendering = true; - bool allow_antialiasing = true; - bool force_antialiasing = false; - bool force_blending_with_shaders = false; -diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc -index e4deb71ea3afa1ef9d6ddac9c61f5916ff608514..d2e6854ac2aaa3cc83c0b72ebc03193b5dc54149 100644 ---- a/components/viz/host/renderer_settings_creation.cc -+++ b/components/viz/host/renderer_settings_creation.cc -@@ -17,6 +17,7 @@ - #include "components/viz/common/features.h" - #include "components/viz/common/switches.h" - #include "ui/base/ui_base_switches.h" -+#include "ui/gfx/switches.h" - - #if BUILDFLAG(IS_OZONE) - #include "ui/ozone/public/ozone_platform.h" -@@ -49,6 +50,8 @@ bool GetSwitchValueAsInt(const base::CommandLine* command_line, - RendererSettings CreateRendererSettings() { - RendererSettings renderer_settings; - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -+ renderer_settings.enable_color_correct_rendering = -+ !command_line->HasSwitch(switches::kDisableColorCorrectRendering); - renderer_settings.partial_swap_enabled = - !command_line->HasSwitch(switches::kUIDisablePartialSwap); - -diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 8f305d8563d8ce23d372decba75ee918e917d3aa..7550a286cb3cbc10680dcc37f840c9861ec3b9df 100644 ---- a/content/browser/gpu/gpu_process_host.cc -+++ b/content/browser/gpu/gpu_process_host.cc -@@ -229,6 +229,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( - - // Command-line switches to propagate to the GPU process. - static const char* const kSwitchNames[] = { -+ switches::kDisableColorCorrectRendering, - sandbox::policy::switches::kDisableSeccompFilterSandbox, - sandbox::policy::switches::kGpuSandboxAllowSysVShm, - sandbox::policy::switches::kGpuSandboxFailuresFatal, -diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 73cad457ad37cfdb5459c11e7828a543dc0cf31d..49429659b2e9cb63314baa5b724105ebeeb4a7a0 100644 ---- a/content/browser/renderer_host/render_process_host_impl.cc -+++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3387,6 +3387,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( - // Propagate the following switches to the renderer command line (along - // with any associated values) if present in the browser command line. - static const char* const kSwitchNames[] = { -+ switches::kDisableColorCorrectRendering, - switches::kDisableInProcessStackTraces, - sandbox::policy::switches::kDisableSeccompFilterSandbox, - sandbox::policy::switches::kNoSandbox, -diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc -index 6892376fa33d006453977c354734d880a7ef7c91..4cd7b762d5fe1c54f5b06cc0d8f50560d6431a2f 100644 ---- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc -+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc -@@ -4,6 +4,7 @@ - - #include "third_party/blink/renderer/platform/graphics/canvas_color_params.h" - -+#include "base/command_line.h" - #include "cc/paint/skia_paint_canvas.h" - #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" - #include "third_party/khronos/GLES2/gl2.h" -@@ -11,6 +12,7 @@ - #include "third_party/khronos/GLES3/gl3.h" - #include "third_party/skia/include/core/SkSurfaceProps.h" - #include "ui/gfx/color_space.h" -+#include "ui/gfx/switches.h" - - namespace blink { - -@@ -18,6 +20,10 @@ namespace blink { - // Level 4 specification. - gfx::ColorSpace PredefinedColorSpaceToGfxColorSpace( - PredefinedColorSpace color_space) { -+ auto* cmd_line = base::CommandLine::ForCurrentProcess(); -+ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { -+ return gfx::ColorSpace(); -+ } - switch (color_space) { - case PredefinedColorSpace::kSRGB: - return gfx::ColorSpace::CreateSRGB(); -@@ -117,6 +123,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const { - } - - gfx::ColorSpace CanvasColorParams::GetStorageGfxColorSpace() const { -+ auto* cmd_line = base::CommandLine::ForCurrentProcess(); -+ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { -+ return gfx::ColorSpace(); -+ } -+ - return PredefinedColorSpaceToGfxColorSpace(color_space_); - } - -diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -index ab5742a30a9d8319ec4596bb99313ea05841e316..5ffc2a38f66f3ab2c82102e996f8e9314da1286e 100644 ---- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -+++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -@@ -30,6 +30,7 @@ - #include "third_party/blink/renderer/platform/web_test_support.h" - #include "ui/base/ui_base_features.h" - #include "ui/base/ui_base_switches.h" -+#include "ui/gfx/switches.h" - #include "ui/native_theme/native_theme_features.h" - #include "ui/native_theme/overlay_scrollbar_constants_aura.h" - -@@ -266,6 +267,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings( - settings.main_frame_before_activation_enabled = - cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); - -+ settings.enable_color_correct_rendering = -+ !cmd.HasSwitch(::switches::kDisableColorCorrectRendering); -+ - // Checkerimaging is not supported for synchronous single-threaded mode, which - // is what the renderer uses if its not threaded. - settings.enable_checker_imaging = -diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc -index a66a9eacee191c7be9ed172b8db1dcd02f983d49..25e251f5afa50fb3bb0cab74efb740ea621cbab7 100644 ---- a/ui/gfx/mac/io_surface.cc -+++ b/ui/gfx/mac/io_surface.cc -@@ -21,6 +21,7 @@ - #include "ui/gfx/color_space.h" - #include "ui/gfx/icc_profile.h" - #include "ui/gfx/mac/color_space_util.h" -+#include "ui/gfx/switches.h" - - namespace gfx { - -@@ -147,6 +148,14 @@ void IOSurfaceMachPortTraits::Release(mach_port_t port) { - // Common method used by IOSurfaceSetColorSpace and IOSurfaceCanSetColorSpace. - bool IOSurfaceSetColorSpace(IOSurfaceRef io_surface, - const ColorSpace& color_space) { -+ auto* cmd_line = base::CommandLine::ForCurrentProcess(); -+ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { -+ base::apple::ScopedCFTypeRef system_icc( -+ CGColorSpaceCopyICCData(base::mac::GetSystemColorSpace())); -+ IOSurfaceSetValue(io_surface, CFSTR("IOSurfaceColorSpace"), system_icc.get()); -+ return true; -+ } -+ - // Allow but ignore invalid color spaces. - if (!color_space.IsValid()) - return true; -@@ -340,6 +349,15 @@ base::apple::ScopedCFTypeRef CreateIOSurface( - DCHECK_EQ(kIOReturnSuccess, r); - } - -+ auto* cmd_line = base::CommandLine::ForCurrentProcess(); -+ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { -+ CGColorSpaceRef color_space = base::mac::GetSystemColorSpace(); -+ base::apple::ScopedCFTypeRef color_space_icc( -+ CGColorSpaceCopyICCData(color_space)); -+ IOSurfaceSetValue(surface.get(), CFSTR("IOSurfaceColorSpace"), color_space_icc.get()); -+ return surface; -+ } -+ - // Ensure that all IOSurfaces start as sRGB. - IOSurfaceSetValue(surface.get(), CFSTR("IOSurfaceColorSpace"), - kCGColorSpaceSRGB); -diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc -index 1bf6fffae161414d650be3210c427dcc47ac1cf8..64a6e263c693b17b26a538219ab681000b98cb9a 100644 ---- a/ui/gfx/switches.cc -+++ b/ui/gfx/switches.cc -@@ -13,6 +13,8 @@ namespace switches { - // only apply to LinearAnimation and its subclasses. - const char kAnimationDurationScale[] = "animation-duration-scale"; - -+const char kDisableColorCorrectRendering[] = "disable-color-correct-rendering"; -+ - // Force disables font subpixel positioning. This affects the character glyph - // sharpness, kerning, hinting and layout. - const char kDisableFontSubpixelPositioning[] = -diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h -index 98697d908f507e30ffbe0e5f5996afb7856f7c12..039024924c7fc10d8311746b88369dec1732a9d0 100644 ---- a/ui/gfx/switches.h -+++ b/ui/gfx/switches.h -@@ -13,6 +13,7 @@ - namespace switches { - - GFX_SWITCHES_EXPORT extern const char kAnimationDurationScale[]; -+GFX_SWITCHES_EXPORT extern const char kDisableColorCorrectRendering[]; - GFX_SWITCHES_EXPORT extern const char kDisableFontSubpixelPositioning[]; - GFX_SWITCHES_EXPORT extern const char kEnableNativeGpuMemoryBuffers[]; - GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; From 82cee7ed2308611b10b2843b8c8faa884162d70d Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 10 Jan 2024 23:54:20 +1300 Subject: [PATCH 25/27] chore: add WEB_PRINTING to content permission converter Unused in non-cros so no need to document Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5136178 --- shell/common/gin_converters/content_converter.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/common/gin_converters/content_converter.cc b/shell/common/gin_converters/content_converter.cc index 4f1bb7c77d2b7..beedbb6babf65 100644 --- a/shell/common/gin_converters/content_converter.cc +++ b/shell/common/gin_converters/content_converter.cc @@ -256,6 +256,8 @@ v8::Local Converter::ToV8( return StringToV8(isolate, "captured-surface-control"); case blink::PermissionType::SMART_CARD: return StringToV8(isolate, "smart-card"); + case blink::PermissionType::WEB_PRINTING: + return StringToV8(isolate, "web-printing"); case blink::PermissionType::NUM: break; } From 81d5f64585aa435961b1357c0c4bada41d4b854c Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 11 Jan 2024 01:20:42 +1300 Subject: [PATCH 26/27] chore: Views is now vec instead of raw Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5140028 --- shell/browser/ui/views/menu_bar.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc index 990178c6f28bd..652de1f25a98c 100644 --- a/shell/browser/ui/views/menu_bar.cc +++ b/shell/browser/ui/views/menu_bar.cc @@ -54,14 +54,14 @@ void MenuBar::SetMenu(ElectronMenuModel* model) { } void MenuBar::SetAcceleratorVisibility(bool visible) { - for (auto* child : GetChildrenInZOrder()) + for (views::View* child : GetChildrenInZOrder()) static_cast(child)->SetAcceleratorVisibility(visible); } MenuBar::View* MenuBar::FindAccelChild(char16_t key) { if (key == 0) return nullptr; - for (auto* child : GetChildrenInZOrder()) { + for (views::View* child : GetChildrenInZOrder()) { if (static_cast(child)->accelerator() == key) return child; } @@ -188,7 +188,7 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event& event) { } SubmenuButton* source = nullptr; - for (auto* child : children()) { + for (views::View* child : children()) { auto* button = static_cast(child); int button_id = button->GetID(); if (button_id >= 0 && static_cast(button_id) == id) { @@ -252,7 +252,7 @@ void MenuBar::UpdateViewColors() { #if BUILDFLAG(IS_LINUX) const auto& textColor = window_->IsFocused() ? enabled_color_ : disabled_color_; - for (auto* child : GetChildrenInZOrder()) { + for (views::View* child : GetChildrenInZOrder()) { auto* button = static_cast(child); button->SetTextColor(views::Button::STATE_NORMAL, textColor); button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_); @@ -261,7 +261,7 @@ void MenuBar::UpdateViewColors() { button->SetUnderlineColor(textColor); } #elif BUILDFLAG(IS_WIN) - for (auto* child : GetChildrenInZOrder()) { + for (views::View* child : GetChildrenInZOrder()) { auto* button = static_cast(child); button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT)); } From a0341b78e76aa6ee8c0ee225e27e5123dad2aeb0 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 11 Jan 2024 15:15:10 +1300 Subject: [PATCH 27/27] spec: add Iterator to global intrinsics --- patches/node/.patches | 1 + ...ec_add_iterator_to_global_intrinsics.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 patches/node/spec_add_iterator_to_global_intrinsics.patch diff --git a/patches/node/.patches b/patches/node/.patches index ca61e30dc3e0e..7042e26f1458c 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -46,3 +46,4 @@ src_fix_compatility_with_upcoming_v8_12_1_apis.patch fix_-wshadow_error_in_uvwasi_c.patch src_update_default_v8_platform_to_override_functions_with_location.patch fix_capture_embedder_exceptions_before_entering_v8.patch +spec_add_iterator_to_global_intrinsics.patch diff --git a/patches/node/spec_add_iterator_to_global_intrinsics.patch b/patches/node/spec_add_iterator_to_global_intrinsics.patch new file mode 100644 index 0000000000000..3e61af19f7a94 --- /dev/null +++ b/patches/node/spec_add_iterator_to_global_intrinsics.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Attard +Date: Thu, 11 Jan 2024 15:14:43 +1300 +Subject: spec: add Iterator to global intrinsics + +Ref: https://chromium-review.googlesource.com/c/v8/v8/+/4266490 + +diff --git a/test/common/globals.js b/test/common/globals.js +index 8b9b6b34f6abaf713f362e8bcdbd140a86dfa767..7b5643a926d970e0e6c91d52b86ebd857d2cf062 100644 +--- a/test/common/globals.js ++++ b/test/common/globals.js +@@ -63,6 +63,7 @@ const intrinsics = new Set([ + 'SharedArrayBuffer', + 'Atomics', + 'WebAssembly', ++ 'Iterator', + ]); + + if (global.gc) {