From a22511a196ce5e2793687dddbdd3fd4f6d20b22b Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:27:35 +0100 Subject: [PATCH] chore: bump chromium to 144.0.7514.0 (main) (#48840) * chore: bump chromium in DEPS to 144.0.7514.0 * chore: update patches * 7119882: Reorganize //ui/gfx GN build target https://chromium-review.googlesource.com/c/chromium/src/+/7119882 * Replace includes with forward declares in rect_conversions.h https://chromium-review.googlesource.com/c/chromium/src/+/7127098 * Add ssl info to TrustedHeaderClient https://chromium-review.googlesource.com/c/chromium/src/+/7106780 * Replace ContentPluginInfo with WebPluginInfo https://chromium-review.googlesource.com/c/chromium/src/+/7127893 * Reland "[temporal] Unflag Temporal" https://chromium-review.googlesource.com/c/v8/v8/+/7123876 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- DEPS | 2 +- ..._mojom_interfaces_to_depend_on_blink.patch | 4 ++-- ..._depend_on_packed_resource_integrity.patch | 12 +++++----- patches/chromium/can_create_window.patch | 8 +++---- ...fy_chromium_handling_of_mouse_events.patch | 8 +++---- ...screationoverridden_with_full_params.patch | 6 ++--- .../chromium/enable_reset_aspect_ratio.patch | 4 ++-- ...xpose_setuseragent_on_networkcontext.patch | 2 +- ...t_allow_code_cache_in_custom_schemes.patch | 2 +- ...moothing_css_rule_and_blink_painting.patch | 2 +- ...screen_rendering_with_viz_compositor.patch | 2 +- ..._raw_response_headers_from_urlloader.patch | 12 +++++----- .../fix_aspect_ratio_with_max_size.patch | 4 ++-- ..._file_existence_before_setting_mtime.patch | 2 +- ...x_remove_caption-removing_style_call.patch | 4 ++-- ..._material_update_issue_on_windows_11.patch | 10 ++++---- ..._avoid_private_macos_api_usage.patch.patch | 24 ++++++++----------- ...emote_certificate_verification_logic.patch | 2 +- .../render_widget_host_view_mac.patch | 2 +- ...ean_up_stale_macwebcontentsocclusion.patch | 8 +++---- ...al_remove_unused_prehandlemouseevent.patch | 6 ++--- ...windowtreehostwin_window_enlargement.patch | 4 ++-- patches/chromium/scroll_bounce_flag.patch | 4 ++-- patches/node/.patches | 1 + .../reland_temporal_unflag_temporal.patch | 19 +++++++++++++++ shell/app/electron_content_client.cc | 23 ++++++++++-------- shell/app/electron_content_client.h | 2 +- .../net/proxying_url_loader_factory.cc | 1 + .../browser/net/proxying_url_loader_factory.h | 2 ++ shell/browser/net/proxying_websocket.cc | 8 ++++--- shell/browser/net/proxying_websocket.h | 2 ++ shell/common/electron_constants.h | 2 -- shell/common/gin_converters/gfx_converter.cc | 1 + shell/common/plugin_info.h | 2 +- 34 files changed, 111 insertions(+), 86 deletions(-) create mode 100644 patches/node/reland_temporal_unflag_temporal.patch diff --git a/DEPS b/DEPS index 32e0a7c9a5..fa17c75c91 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '144.0.7512.1', + '144.0.7514.0', 'node_version': 'v24.11.0', 'nan_version': diff --git a/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch b/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch index ce3658f769..dcd3fd7891 100644 --- a/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch +++ b/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch @@ -10,10 +10,10 @@ Needed for: 2) //electron/shell/common:web_contents_utility diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn -index e463b4c63105d021da2467844c8371eec6b8a836..bd81d75d735f997bf6aa9133e142b50759084b47 100644 +index 33440fbace3d6d9cbbe74c4ce0ccf7b6137b43e5..e92dac385501107848e9937cdc145ed0d2ec3bb7 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn -@@ -371,6 +371,8 @@ mojom("interfaces") { +@@ -363,6 +363,8 @@ mojom("interfaces") { "//content/common/*", "//extensions/common:mojom", "//extensions/common:mojom_blink", 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 326f17d240..ddbb47feef 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 606b3bd43179a5b4179a6ec9f58e531d55c1acb5..4d503a53290b4deaea016bb6867f3c07 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index a41ecd9b5776f3c56b4b1e3b29edee120600bf92..2e5e007ef68de105ba458a2ff771b4316aed2817 100644 +index 8875f14e87d62c5934612b635039265e8fe3fe60..eba5f45104d9837a6ab8c4aee2f6742ab4383a46 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4820,7 +4820,7 @@ static_library("browser") { +@@ -4822,7 +4822,7 @@ static_library("browser") { ] } @@ -46,10 +46,10 @@ index a41ecd9b5776f3c56b4b1e3b29edee120600bf92..2e5e007ef68de105ba458a2ff771b431 # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 11b17980ae54d0e6d40b87821ff5e8831fc6315f..2be9c078fca499b63a21e0a72f498e93c2d1c6f4 100644 +index 1aa0ffd684c95f0c7818997b10dfabe61a055a64..24f733c03f5cdb376c4004841e86ddd5bba690e3 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7590,9 +7590,12 @@ test("unit_tests") { +@@ -7592,9 +7592,12 @@ test("unit_tests") { "//chrome/notification_helper", ] @@ -63,7 +63,7 @@ index 11b17980ae54d0e6d40b87821ff5e8831fc6315f..2be9c078fca499b63a21e0a72f498e93 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8533,6 +8536,10 @@ test("unit_tests") { +@@ -8535,6 +8538,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index 11b17980ae54d0e6d40b87821ff5e8831fc6315f..2be9c078fca499b63a21e0a72f498e93 sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8589,7 +8596,6 @@ test("unit_tests") { +@@ -8591,7 +8598,6 @@ test("unit_tests") { # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? deps += [ "../browser/screen_ai:screen_ai_install_state", diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 98f2944e3c..600abf5a40 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -111,10 +111,10 @@ index 0d0e5e0eabbcb8ce19b675dadf5580f8381fb8ce..b10f6ae7612556e2f4cff60d38a88b5f bool opener_suppressed, bool* no_javascript_access); diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc -index be43d917f1c881e1c97ccb72860fddab4b113e3c..5a88086b6957b9addc0598d58c41288f0065b0e6 100644 +index 822aa432131b68722307c3d57a73bc0e5bd589ff..541a17144b2d906865a025711dee0be776712a93 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc -@@ -34,6 +34,17 @@ namespace content { +@@ -35,6 +35,17 @@ namespace content { WebContentsDelegate::WebContentsDelegate() = default; @@ -133,7 +133,7 @@ index be43d917f1c881e1c97ccb72860fddab4b113e3c..5a88086b6957b9addc0598d58c41288f WebContents* source, const OpenURLParams& params, diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index 3d67b3751ef13c9a43e48a124aefaea24db9140c..dea523e84616527b9ac0a25e67c8664aafd3b511 100644 +index 31f7b81c176f8011e370c03b9f9d5016b12f6def..5780c53b97d983652a4e08009533a33abee228c8 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -18,6 +18,7 @@ @@ -151,7 +151,7 @@ index 3d67b3751ef13c9a43e48a124aefaea24db9140c..dea523e84616527b9ac0a25e67c8664a +#include "content/public/browser/web_contents.h" #include "content/public/common/window_container_type.mojom-forward.h" #include "third_party/blink/public/common/input/web_mouse_event.h" - #include "third_party/blink/public/common/mediastream/media_stream_request.h" + #include "third_party/blink/public/common/page/drag_operation.h" @@ -385,6 +387,16 @@ class CONTENT_EXPORT WebContentsDelegate { const StoragePartitionConfig& partition_config, SessionStorageNamespace* session_storage_namespace); diff --git a/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch b/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch index cb612ff00f..c257a1eaa7 100644 --- a/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch +++ b/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch @@ -61,10 +61,10 @@ index b65ced55f997d5064b9d9338190567f8c264fce8..e8acd2828ed05deefa335ce2bb461f0c 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 75a21333701b3501f785229ae9a358c5cac685df..579becb9a32704d932b8dfba477515af8529a2d4 100644 +index 1826e096e258004471ce2bd0c01bcdaff9d60022..faa7972cd2fb60bc9d20506309ce65ef4cafd233 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -3243,15 +3243,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -3247,15 +3247,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, } // We must let Windows handle the caption buttons if it's drawing them, or // they won't work. @@ -86,7 +86,7 @@ index 75a21333701b3501f785229ae9a358c5cac685df..579becb9a32704d932b8dfba477515af return 0; } } -@@ -3274,6 +3278,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -3278,6 +3282,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, // handle alt-space, or in the frame itself. is_right_mouse_pressed_on_caption_ = false; ReleaseCapture(); @@ -94,7 +94,7 @@ index 75a21333701b3501f785229ae9a358c5cac685df..579becb9a32704d932b8dfba477515af // |point| is in window coordinates, but WM_NCHITTEST and TrackPopupMenu() // expect screen coordinates. POINT screen_point = CR_POINT_INITIALIZER_FROM_LPARAM(l_param); -@@ -3281,7 +3286,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -3285,7 +3290,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, w_param = static_cast(SendMessage( hwnd(), WM_NCHITTEST, 0, MAKELPARAM(screen_point.x, screen_point.y))); if (w_param == HTCAPTION || w_param == HTSYSMENU) { diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index 27b5fd983b..504fb2b580 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -237,10 +237,10 @@ index eebcf3d97557d5a95c00b483910a23717d1775c5..1cc8474a5f369cd0b13c328179c9be56 static_cast(delegate_->CreateCustomWebContents( opener, source_site_instance, is_new_browsing_instance, diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc -index 5a88086b6957b9addc0598d58c41288f0065b0e6..54ab4e1426eaa19bfe71b5fdd52e115aae4f0c45 100644 +index 541a17144b2d906865a025711dee0be776712a93..9223d7355402f07c666df7ac4c19e9eab7d90e99 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc -@@ -160,8 +160,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden( +@@ -161,8 +161,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden( SiteInstance* source_site_instance, mojom::WindowContainerType window_container_type, const GURL& opener_url, @@ -251,7 +251,7 @@ index 5a88086b6957b9addc0598d58c41288f0065b0e6..54ab4e1426eaa19bfe71b5fdd52e115a } diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index dea523e84616527b9ac0a25e67c8664aafd3b511..816b53d21e568a3d7a6f5902d87c5315ffedeee2 100644 +index 5780c53b97d983652a4e08009533a33abee228c8..1a73f726ac1cf55b2834cf8db57b84add376cf7a 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -365,8 +365,7 @@ class CONTENT_EXPORT WebContentsDelegate { diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch index b25176e039..7843bf5b39 100644 --- a/patches/chromium/enable_reset_aspect_ratio.patch +++ b/patches/chromium/enable_reset_aspect_ratio.patch @@ -19,10 +19,10 @@ index cb704a865eb1b748163a7c25b0a571585c2497b4..3b2fbefaeec2bac725d46bcfeea48812 excluded_margin); } diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 86aa7d062e6bfc4ceb79f8852bef34998538a338..14c6a37e16d66967a229c08de83c54192ccdc3c5 100644 +index a919d3bbafc1a16d66c647c2a1b7819af9d0dd1d..acd69eb0a38241db8ae5a3a1d7009366383d1817 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -1050,8 +1050,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen, +@@ -1054,8 +1054,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen, void HWNDMessageHandler::SetAspectRatio(float aspect_ratio, const gfx::Size& excluded_margin) { diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index 5793d3a202..b65432f6f1 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -63,7 +63,7 @@ index 90cf1a70c068771ac98b2d5a283cba5e54c05ff4..0dc8de8d4e37e48cb28d8112c0233ac8 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 8f1e7e517104a4849c96b19d8bedd57ac9a88ec6..6c7d5d8fd7a62c7d0484ae43664a36da6ef9b9ba 100644 +index 269b95a51029b2a2e42d663988f2c1b8a74f91a8..b819cd38ab8921d494caff3d2ae0ab86c9860d9c 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -1345,6 +1345,9 @@ interface NetworkContext { diff --git a/patches/chromium/feat_allow_code_cache_in_custom_schemes.patch b/patches/chromium/feat_allow_code_cache_in_custom_schemes.patch index ec00fd692b..d2febc523d 100644 --- a/patches/chromium/feat_allow_code_cache_in_custom_schemes.patch +++ b/patches/chromium/feat_allow_code_cache_in_custom_schemes.patch @@ -391,7 +391,7 @@ index 225e017909b8869231b870eaaf161a0b5e93e2a0..846a5251429630b8528a84a3d67ed56c if (schemes.allow_non_standard_schemes_in_origins) url::EnableNonStandardSchemesForAndroidWebView(); diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h -index c81434acc7cad0f6aa2e807c3c4037052863179e..d0da89f78308fc95778a5ce705a43f03c9c5813f 100644 +index 33e2ff42e4d9da442d522b959a4a21c2f7032b6b..a0d81212327fc17e1f4704e78803c1d7d82b2016 100644 --- a/content/public/common/content_client.h +++ b/content/public/common/content_client.h @@ -139,6 +139,9 @@ class CONTENT_EXPORT ContentClient { diff --git a/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch b/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch index fad5d580f1..b8148ddbc7 100644 --- a/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch +++ b/patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch @@ -312,7 +312,7 @@ index 1d6b8160e8db2a94ee61ed41ac9a74db5b1bfb17..373bcd30c6a4526262912021aaf2b560 auto DrawAsSinglePath = [&]() { diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index 0c3ea906c3bca432f49835848519922bdd17e6ac..b18903a4f8e7f8cdcd7d5165ff25cd7fba3f7a5c 100644 +index 675877eb7d2f99ca4da455065dcf3a8e0a3eb5d5..d803d333f15d5b9426b44ad6d39bcb41f64a4591 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -214,6 +214,10 @@ diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 82a5e49fff..b5fd39f44b 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -563,7 +563,7 @@ index 399fba1a3d4e601dc2cdd5f1f4def8b7fd7a3011..8bcbe0d26c80323155d536c0d3a177a1 gpu::SyncPointManager* GetSyncPointManager() override; gpu::Scheduler* GetGpuScheduler() override; diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc -index d8f825a29c50f47a35ef2ff4dc03c0a8d27d877d..4dba804d04626183c749b75b317fd26ee6d57f54 100644 +index 43d29976d8bd42d3ee6857db7d61f31c26795848..1d5852b1e4f1e628bd9b24b381ff3b17a4dd9165 100644 --- a/content/browser/compositor/viz_process_transport_factory.cc +++ b/content/browser/compositor/viz_process_transport_factory.cc @@ -381,8 +381,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( 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 33d1f9d565..b44f9d0526 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -112,10 +112,10 @@ index 13a211107294e856616d1626fa1dc9c79eb5646c..549a36886d665c1a8100f09b7a86c8dc string mime_type; diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index e30252c08f9f82594ecd455c9db77e22fbd64296..4cf20063a2621575513f74257e1ea1a101420889 100644 +index a28a4bfc26a797dc862c59a337b4ed43b76eb06d..4da33fa9eef14b76f06d2741942fc387b2cde37d 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc -@@ -385,6 +385,9 @@ URLLoader::URLLoader( +@@ -386,6 +386,9 @@ URLLoader::URLLoader( mojo::SimpleWatcher::ArmingPolicy::MANUAL, TaskRunner(request.priority)), per_factory_orb_state_(context.GetMutableOrbState()), @@ -125,7 +125,7 @@ index e30252c08f9f82594ecd455c9db77e22fbd64296..4cf20063a2621575513f74257e1ea1a1 devtools_request_id_(request.devtools_request_id), options_(PopulateOptions(options, factory_params_->is_orb_enabled, -@@ -524,7 +527,7 @@ void URLLoader::SetUpUrlRequestCallbacks( +@@ -525,7 +528,7 @@ void URLLoader::SetUpUrlRequestCallbacks( &URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this))); } @@ -134,7 +134,7 @@ index e30252c08f9f82594ecd455c9db77e22fbd64296..4cf20063a2621575513f74257e1ea1a1 url_request_->SetResponseHeadersCallback(base::BindRepeating( &URLLoader::SetRawResponseHeaders, base::Unretained(this))); } -@@ -1121,6 +1124,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { +@@ -1122,6 +1125,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { } response_ = BuildResponseHead(); @@ -155,10 +155,10 @@ index e30252c08f9f82594ecd455c9db77e22fbd64296..4cf20063a2621575513f74257e1ea1a1 ad_auction_event_record_request_helper_.HandleResponse( diff --git a/services/network/url_loader.h b/services/network/url_loader.h -index d78b426e45a805ce03ec9ad6e160995f18d6ff24..26d998bdf534c5aa85dcef75f2df0a4f39296bfb 100644 +index f437df6e20b7d4e28f5e57e2134c5c7fa9da2bdc..661fef04f6b76abef852ba8eef63b1f78b01652c 100644 --- a/services/network/url_loader.h +++ b/services/network/url_loader.h -@@ -623,6 +623,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader +@@ -624,6 +624,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader std::unique_ptr resource_scheduler_request_handle_; diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch index bbbb88a798..f463042424 100644 --- a/patches/chromium/fix_aspect_ratio_with_max_size.patch +++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch @@ -11,10 +11,10 @@ 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 14c6a37e16d66967a229c08de83c54192ccdc3c5..75a21333701b3501f785229ae9a358c5cac685df 100644 +index acd69eb0a38241db8ae5a3a1d7009366383d1817..1826e096e258004471ce2bd0c01bcdaff9d60022 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -3831,17 +3831,30 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param, +@@ -3835,17 +3835,30 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param, delegate_->GetMinMaxSize(&min_window_size, &max_window_size); min_window_size = delegate_->DIPToScreenSize(min_window_size); max_window_size = delegate_->DIPToScreenSize(max_window_size); diff --git a/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch b/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch index 33ca2f1da2..194fb15119 100644 --- a/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch +++ b/patches/chromium/fix_check_for_file_existence_before_setting_mtime.patch @@ -8,7 +8,7 @@ Check for broken links by confirming the file exists before setting its utime. This patch should be upstreamed & removed. diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index f2a9172815d80e6a9a70d7775eec6fdddd925461..54f78924eb09abf19d19c698e4c37f5ec3dc8249 100755 +index 1a35e992913acae102adc3faf0065ef13e6dbd1b..39e0d541e228e71108fa23717a906a0c543fe268 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -201,10 +201,9 @@ def DownloadAndUnpack(url, output_dir, path_prefixes=None, is_known_zip=False): diff --git a/patches/chromium/fix_remove_caption-removing_style_call.patch b/patches/chromium/fix_remove_caption-removing_style_call.patch index 8de69c9bfe..d2d69ee08f 100644 --- a/patches/chromium/fix_remove_caption-removing_style_call.patch +++ b/patches/chromium/fix_remove_caption-removing_style_call.patch @@ -18,10 +18,10 @@ 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 579becb9a32704d932b8dfba477515af8529a2d4..9e7e2740481af8e6a63e02e6c8ca4e448c25b0be 100644 +index faa7972cd2fb60bc9d20506309ce65ef4cafd233..ec43fba03d329ed4d8ec0ebc0bef23d31bfb9440 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -1857,7 +1857,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) { +@@ -1861,7 +1861,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) { SendMessage(hwnd(), WM_CHANGEUISTATE, MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0); diff --git a/patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch b/patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch index 2f5266fec9..df84f04bb6 100644 --- a/patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch +++ b/patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch @@ -36,10 +36,10 @@ index 0cd07fd5fb55dcc0d972de4c027fcb895d156592..0f4d335e1d54b5e92fc217080d86513d // Overridden from DesktopWindowTreeHost: void Init(const Widget::InitParams& params) override; diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 9e7e2740481af8e6a63e02e6c8ca4e448c25b0be..8449383866c668ffac830852b894c8fa525d5814 100644 +index ec43fba03d329ed4d8ec0ebc0bef23d31bfb9440..86cbf8cfdf10bc84c85724cd370cc0322e13b418 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -994,13 +994,13 @@ void HWNDMessageHandler::FrameTypeChanged() { +@@ -998,13 +998,13 @@ void HWNDMessageHandler::FrameTypeChanged() { void HWNDMessageHandler::PaintAsActiveChanged() { if (!delegate_->HasNonClientView() || !delegate_->CanActivate() || @@ -55,7 +55,7 @@ index 9e7e2740481af8e6a63e02e6c8ca4e448c25b0be..8449383866c668ffac830852b894c8fa } void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon, -@@ -1081,7 +1081,14 @@ void HWNDMessageHandler::SizeConstraintsChanged() { +@@ -1085,7 +1085,14 @@ void HWNDMessageHandler::SizeConstraintsChanged() { // allowing ui::GetResizableFrameThickness() to be used consistently when // removing the visible system frame. const bool had_caption_on_init = window_style() & WS_CAPTION; @@ -71,7 +71,7 @@ index 9e7e2740481af8e6a63e02e6c8ca4e448c25b0be..8449383866c668ffac830852b894c8fa const bool can_maximize = can_resize && delegate_->CanMaximize(); auto set_style_func = [&style](LONG bit, bool should_set) { -@@ -1679,11 +1686,16 @@ void HWNDMessageHandler::ResetWindowRegion(bool force, bool redraw) { +@@ -1683,11 +1690,16 @@ void HWNDMessageHandler::ResetWindowRegion(bool force, bool redraw) { // through, but that isn't the case when using Direct3D to draw transparent // windows. So we route translucent windows throught to the delegate to // allow for a custom hit mask. @@ -89,7 +89,7 @@ index 9e7e2740481af8e6a63e02e6c8ca4e448c25b0be..8449383866c668ffac830852b894c8fa return; } -@@ -2416,17 +2428,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message, +@@ -2420,17 +2432,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message, delegate_->SchedulePaint(); } 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 fc310818d9..4dacc96e30 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -547,7 +547,7 @@ index 010c713090e5038dc90db131c8f621422d30c03b..20c35e887a0496ee609c077e3b0494bd void ForwardKeyboardEvent(const input::NativeWebKeyboardEvent& key_event, diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index 6f3496b2541fa21fd0bba1d95026eab30e3ab96d..ef481cd946a15f5eaba928fa4e720e6c42556a93 100644 +index f69cd6100f2ac5ccb6f185e0d0bf186073ed5953..29a40923a55287b608c2ffae63a1dbbc2a7e7c1d 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 @@ -34,6 +34,7 @@ @@ -558,7 +558,7 @@ index 6f3496b2541fa21fd0bba1d95026eab30e3ab96d..ef481cd946a15f5eaba928fa4e720e6c #include "skia/ext/skia_utils_mac.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/input/input_handler.mojom.h" -@@ -2085,15 +2086,21 @@ - (NSAccessibilityRole)accessibilityRole { +@@ -2090,15 +2091,21 @@ - (NSAccessibilityRole)accessibilityRole { // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -1804,22 +1804,18 @@ index 890d86acb0e92760590b4d0860dd41eaa70486c7..2e9e16cb47606f627b1473a479a6e8ae // Query the display's refresh rate. double refresh_rate = 1.0 / screen.minimumRefreshInterval; diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn -index f29089286f4848400a67c3b7eaf21a1ba291cc1e..fa92acfa219f82cf53207e3a7479e44b223e9050 100644 +index 35e9149e221721c6d4332de530877588022bc7c7..2910455828b7d5025daa8e62071a68a67bed46d5 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn -@@ -333,6 +333,12 @@ component("gfx") { - "//ui/base:ui_data_pack", - ] - -+ if (is_mac) { -+ deps += [ -+ "//electron/build/config:generate_mas_config" -+ ] -+ } +@@ -277,6 +277,8 @@ component("gfx") { + "CoreGraphics.framework", + "CoreText.framework", + ] + - if (!is_apple) { ++ deps += ["//electron/build/config:generate_mas_config"] + } + if (is_ios) { sources += [ - "platform_font_skia.cc", diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm index bbe355cf69f160866188216cc274d75bd35603db..06ee100d7ea2e892dbf3c0b1adc96c5013ef678a 100644 --- a/ui/gfx/platform_font_mac.mm 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 f2c43f09a9..4a7165124f 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -190,7 +190,7 @@ index 3795ce4def719c36e1dace911be53b0103aeafc5..90cf1a70c068771ac98b2d5a283cba5e std::unique_ptr internal_host_resolver_; std::set, base::UniquePtrComparator> diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index bb6136990b69c61ac7e7e00e354f801be6955ff4..8f1e7e517104a4849c96b19d8bedd57ac9a88ec6 100644 +index f2de77f154f4290f4bbf60f6b5697fdc9383427a..269b95a51029b2a2e42d663988f2c1b8a74f91a8 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -311,6 +311,17 @@ struct SocketBrokerRemotes { diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index b1a9f80b6f..9e7254cbb6 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 84fabfc88085ab5c4d3e19db4bc472316e56f2f1..6f3496b2541fa21fd0bba1d95026eab30e3ab96d 100644 +index b17bc8928cc86536fa01bd85b921020a2c656ca3..f69cd6100f2ac5ccb6f185e0d0bf186073ed5953 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 @@ -167,6 +167,15 @@ void ExtractUnderlines(NSAttributedString* string, diff --git a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch index 34d049c142..250843c98e 100644 --- a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch +++ b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch @@ -254,10 +254,10 @@ index 17d6d7d935f93afefa9123f56ef9c138c3070f93..8dfa7501a6a2998e107bf9b51f5e5c3d } diff --git a/content/common/features.cc b/content/common/features.cc -index aa548cad26cb2a552cc34ea0e415a9a4ca5e2bba..4d28affac64b3ef741e75547495218cb781fc66d 100644 +index 67beba0ac7763c162eb105ecf3df3ca0c2ca4827..3742f8823ba1399b63b72145f12dbdfa02b4524d 100644 --- a/content/common/features.cc +++ b/content/common/features.cc -@@ -317,6 +317,14 @@ BASE_FEATURE(kInterestGroupUpdateIfOlderThan, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -322,6 +322,14 @@ BASE_FEATURE(kInterestGroupUpdateIfOlderThan, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kIOSurfaceCapturer, base::FEATURE_ENABLED_BY_DEFAULT); #endif @@ -273,10 +273,10 @@ index aa548cad26cb2a552cc34ea0e415a9a4ca5e2bba..4d28affac64b3ef741e75547495218cb BASE_FEATURE(kKeepChildProcessAfterIPCReset, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/content/common/features.h b/content/common/features.h -index 07c6ff157fd519860206cf61b41a9be0cfa65ae7..03643e2ad38906d1e540aeecf3787c3e6c9a1450 100644 +index 9063ec69d6129e80c5679e3ccaf729adcfa85a58..5ccf4999afb697864a54284a7c5b0cb17ea4efdd 100644 --- a/content/common/features.h +++ b/content/common/features.h -@@ -112,6 +112,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan); +@@ -115,6 +115,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan); #if BUILDFLAG(IS_MAC) CONTENT_EXPORT BASE_DECLARE_FEATURE(kIOSurfaceCapturer); #endif diff --git a/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch b/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch index 713bd8a597..3d7e34e166 100644 --- a/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch +++ b/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch @@ -83,10 +83,10 @@ index 2b562b8f8adaced3a87b45f04472313cee3eb479..e8b3edf974c6471ef72654544999e9fe const gfx::PointF& client_pt); void PreHandleDragExit(); diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc -index 54ab4e1426eaa19bfe71b5fdd52e115aae4f0c45..7f2d61d74ccdebee7310a67aaa8819eea52afa13 100644 +index 9223d7355402f07c666df7ac4c19e9eab7d90e99..2bd315eadaf1790d5e3fe104f18c20ffb20de99f 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc -@@ -126,6 +126,12 @@ bool WebContentsDelegate::HandleContextMenu(RenderFrameHost& render_frame_host, +@@ -127,6 +127,12 @@ bool WebContentsDelegate::HandleContextMenu(RenderFrameHost& render_frame_host, return false; } @@ -100,7 +100,7 @@ index 54ab4e1426eaa19bfe71b5fdd52e115aae4f0c45..7f2d61d74ccdebee7310a67aaa8819ee WebContents* source, const input::NativeWebKeyboardEvent& event) { diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index 816b53d21e568a3d7a6f5902d87c5315ffedeee2..bf56692686ed554214081c322aedae2df023fedc 100644 +index 1a73f726ac1cf55b2834cf8db57b84add376cf7a..8115f86ee33c56080ff472fb0f0f227ce2c01e0c 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -311,6 +311,13 @@ class CONTENT_EXPORT WebContentsDelegate { diff --git a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch index f58a2d0c46..e4ddeea1de 100644 --- a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch +++ b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch @@ -10,10 +10,10 @@ on Windows. We should refactor our code so that this patch isn't necessary. diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json -index dffb16c851e3b336bdd1091735a51e2086e87d2e..a9bed1920ff9b1272fd41518b27a0056f0ef1825 100644 +index 7fbdf75c78249414e89828679c69f44573b44942..f8694b63f2c565990b7700059f226204a9559b10 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -25633,6 +25633,21 @@ +@@ -25694,6 +25694,21 @@ ] } ], diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index fecaafb174..1ec9b59f5c 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 3740f509d3271b3397b37727fd8e90b463225b1c..0082895db7b05c162ea242446e587e2f92f341dd 100644 +index f36413e02fae33f9d4ebdc1770674f422464577f..d881c99876918379ebc7f11956f2a64b91f50de4 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1215,7 +1215,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { +@@ -1213,7 +1213,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/node/.patches b/patches/node/.patches index b516207783..172ea7c7e3 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -42,3 +42,4 @@ chore_handle_support_for_import_defer_as_ns_and_import_defer.patch api_delete_deprecated_fields_on_v8_isolate.patch api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch src_use_cp_utf8_for_wide_file_names_on_win32.patch +reland_temporal_unflag_temporal.patch diff --git a/patches/node/reland_temporal_unflag_temporal.patch b/patches/node/reland_temporal_unflag_temporal.patch new file mode 100644 index 0000000000..46f666064a --- /dev/null +++ b/patches/node/reland_temporal_unflag_temporal.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: John Kleinschmidt +Date: Fri, 7 Nov 2025 16:36:35 -0500 +Subject: Reland "[temporal] Unflag Temporal" + +https://chromium-review.googlesource.com/c/v8/v8/+/7123876 + +diff --git a/test/common/globals.js b/test/common/globals.js +index 34563b304f0e708ae066f8303a09e37b6bf123d6..cffba7d5f1936c4459b5afd91b8bc45b9038436d 100644 +--- a/test/common/globals.js ++++ b/test/common/globals.js +@@ -69,6 +69,7 @@ const intrinsics = new Set([ + 'SuppressedError', + 'DisposableStack', + 'AsyncDisposableStack', ++ 'Temporal' + ]); + + if (global.gc) { diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc index c5740f769b..e6fb2f3f7b 100644 --- a/shell/app/electron_content_client.cc +++ b/shell/app/electron_content_client.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/strings/string_split.h" #include "content/public/common/buildflags.h" -#include "content/public/common/content_constants.h" #include "electron/buildflags/buildflags.h" #include "electron/fuses.h" #include "extensions/common/constants.h" @@ -37,7 +36,7 @@ #endif // BUILDFLAG(ENABLE_PDF_VIEWER) #if BUILDFLAG(ENABLE_PLUGINS) -#include "content/public/common/content_plugin_info.h" +#include "content/public/common/webplugininfo.h" #endif // BUILDFLAG(ENABLE_PLUGINS) namespace electron { @@ -162,21 +161,25 @@ void ElectronContentClient::AddAdditionalSchemes(Schemes* schemes) { } void ElectronContentClient::AddPlugins( - std::vector* plugins) { + std::vector* plugins) { #if BUILDFLAG(ENABLE_PDF_VIEWER) + static constexpr char16_t kPDFPluginName[] = u"Chromium PDF Plugin"; + static constexpr char16_t kPDFPluginDescription[] = u"Built-in PDF viewer"; static constexpr char kPDFPluginExtension[] = "pdf"; - static constexpr char kPDFPluginDescription[] = "Portable Document Format"; + static constexpr char kPDFPluginExtensionDescription[] = + "Portable Document Format"; - content::ContentPluginInfo pdf_info; - pdf_info.is_internal = true; - pdf_info.name = kPDFInternalPluginName; - pdf_info.description = kPDFPluginDescription; + content::WebPluginInfo pdf_info; + pdf_info.name = kPDFPluginName; // This isn't a real file path; it's just used as a unique identifier. static constexpr std::string_view kPdfPluginPath = "internal-pdf-viewer"; pdf_info.path = base::FilePath::FromASCII(kPdfPluginPath); - content::WebPluginMimeType pdf_mime_type( - pdf::kInternalPluginMimeType, kPDFPluginExtension, kPDFPluginDescription); + pdf_info.desc = kPDFPluginDescription; + content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType, + kPDFPluginExtension, + kPDFPluginExtensionDescription); pdf_info.mime_types.push_back(pdf_mime_type); + pdf_info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_INTERNAL_PLUGIN; plugins->push_back(pdf_info); #endif // BUILDFLAG(ENABLE_PDF_VIEWER) } diff --git a/shell/app/electron_content_client.h b/shell/app/electron_content_client.h index ffaab188bc..f833881b77 100644 --- a/shell/app/electron_content_client.h +++ b/shell/app/electron_content_client.h @@ -29,7 +29,7 @@ class ElectronContentClient : public content::ContentClient { gfx::Image& GetNativeImageNamed(int resource_id) override; base::RefCountedMemory* GetDataResourceBytes(int resource_id) override; void AddAdditionalSchemes(Schemes* schemes) override; - void AddPlugins(std::vector* plugins) override; + void AddPlugins(std::vector* plugins) override; void AddContentDecryptionModules( std::vector* cdms, std::vector* cdm_host_file_paths) override; diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc index c0c9d67649..6ea5536c9f 100644 --- a/shell/browser/net/proxying_url_loader_factory.cc +++ b/shell/browser/net/proxying_url_loader_factory.cc @@ -343,6 +343,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnBeforeSendHeaders( void ProxyingURLLoaderFactory::InProgressRequest::OnHeadersReceived( const std::string& headers, const net::IPEndPoint& remote_endpoint, + const std::optional& ssl_info, OnHeadersReceivedCallback callback) { if (!current_request_uses_header_client_) { std::move(callback).Run(net::OK, std::nullopt, GURL()); diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h index 0623946cf5..e4b49d1820 100644 --- a/shell/browser/net/proxying_url_loader_factory.h +++ b/shell/browser/net/proxying_url_loader_factory.h @@ -23,6 +23,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/completion_once_callback.h" +#include "net/ssl/ssl_info.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/mojom/network_context.mojom.h" @@ -115,6 +116,7 @@ class ProxyingURLLoaderFactory OnBeforeSendHeadersCallback callback) override; void OnHeadersReceived(const std::string& headers, const net::IPEndPoint& endpoint, + const std::optional& ssl_info, OnHeadersReceivedCallback callback) override; private: diff --git a/shell/browser/net/proxying_websocket.cc b/shell/browser/net/proxying_websocket.cc index 109250b271..9b4a4358a7 100644 --- a/shell/browser/net/proxying_websocket.cc +++ b/shell/browser/net/proxying_websocket.cc @@ -207,9 +207,11 @@ void ProxyingWebSocket::OnBeforeSendHeaders( OnBeforeRequestComplete(net::OK); } -void ProxyingWebSocket::OnHeadersReceived(const std::string& headers, - const net::IPEndPoint& endpoint, - OnHeadersReceivedCallback callback) { +void ProxyingWebSocket::OnHeadersReceived( + const std::string& headers, + const net::IPEndPoint& endpoint, + const std::optional& ssl_info, + OnHeadersReceivedCallback callback) { DCHECK(receiver_as_header_client_.is_bound()); on_headers_received_callback_ = std::move(callback); diff --git a/shell/browser/net/proxying_websocket.h b/shell/browser/net/proxying_websocket.h index 4ce67b658e..ef035c305a 100644 --- a/shell/browser/net/proxying_websocket.h +++ b/shell/browser/net/proxying_websocket.h @@ -16,6 +16,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" +#include "net/ssl/ssl_info.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/websocket.mojom.h" @@ -94,6 +95,7 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient, OnBeforeSendHeadersCallback callback) override; void OnHeadersReceived(const std::string& headers, const net::IPEndPoint& endpoint, + const std::optional& ssl_info, OnHeadersReceivedCallback callback) override; static void StartProxying( diff --git a/shell/common/electron_constants.h b/shell/common/electron_constants.h index 2ddf98d25a..7456addb37 100644 --- a/shell/common/electron_constants.h +++ b/shell/common/electron_constants.h @@ -33,8 +33,6 @@ inline constexpr char kElectronGlobalShortcutsUuid[] = #if BUILDFLAG(ENABLE_PDF_VIEWER) inline constexpr std::string_view kPDFExtensionPluginName = "Chromium PDF Viewer"; -inline constexpr std::string_view kPDFInternalPluginName = - "Chromium PDF Plugin"; #endif // BUILDFLAG(ENABLE_PDF_VIEWER) } // namespace electron diff --git a/shell/common/gin_converters/gfx_converter.cc b/shell/common/gin_converters/gfx_converter.cc index 9f2787eaad..19f3d49180 100644 --- a/shell/common/gin_converters/gfx_converter.cc +++ b/shell/common/gin_converters/gfx_converter.cc @@ -16,6 +16,7 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/resize_utils.h" #include "ui/gfx/geometry/size.h" diff --git a/shell/common/plugin_info.h b/shell/common/plugin_info.h index 94b5f009e0..fddfca63c3 100644 --- a/shell/common/plugin_info.h +++ b/shell/common/plugin_info.h @@ -7,7 +7,7 @@ #include -#include "content/public/common/content_plugin_info.h" +#include "content/public/common/webplugininfo.h" #include "electron/buildflags/buildflags.h" namespace electron {