chore: bump chromium to 140.0.7314.0 (main) (#47882)

* chore: bump chromium in DEPS to 140.0.7314.0

* 6769821: Delegate checking whether preconnect is enabled.

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769821

* 6632993: PDF Searchify IPH: Use embedder WebContents for GuestView PDF

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6632993

* 6769214: [ios blink] Set IOSurface shared memory region on all GMB handles

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769214

* chore: update patches

* 6769572: [soft navs]: Move AsyncSameDocumentNavigationStarted to TaskAttributionTracker

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769572

* chore: node gen-libc++-filenames.js

* 6765740: [SxS] Implement support for split view in extensions API

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6765740

* 6769821: Delegate checking whether preconnect is enabled.

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769821

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
This commit is contained in:
electron-roller[bot] 2025-07-28 15:31:54 -07:00 committed by GitHub
commit f6407b4949
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 189 additions and 108 deletions

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = { vars = {
'chromium_version': 'chromium_version':
'140.0.7312.0', '140.0.7314.0',
'node_version': 'node_version':
'v22.17.1', 'v22.17.1',
'nan_version': 'nan_version':

View file

@ -380,6 +380,8 @@ filenames = {
"shell/browser/electron_navigation_throttle.h", "shell/browser/electron_navigation_throttle.h",
"shell/browser/electron_permission_manager.cc", "shell/browser/electron_permission_manager.cc",
"shell/browser/electron_permission_manager.h", "shell/browser/electron_permission_manager.h",
"shell/browser/electron_preconnect_manager_delegate.cc",
"shell/browser/electron_preconnect_manager_delegate.h",
"shell/browser/electron_speech_recognition_manager_delegate.cc", "shell/browser/electron_speech_recognition_manager_delegate.cc",
"shell/browser/electron_speech_recognition_manager_delegate.h", "shell/browser/electron_speech_recognition_manager_delegate.h",
"shell/browser/electron_web_contents_utility_handler_impl.cc", "shell/browser/electron_web_contents_utility_handler_impl.cc",

View file

@ -1324,6 +1324,7 @@ libcxx_headers = [
"//third_party/libc++/src/include/__ranges/transform_view.h", "//third_party/libc++/src/include/__ranges/transform_view.h",
"//third_party/libc++/src/include/__ranges/view_interface.h", "//third_party/libc++/src/include/__ranges/view_interface.h",
"//third_party/libc++/src/include/__ranges/views.h", "//third_party/libc++/src/include/__ranges/views.h",
"//third_party/libc++/src/include/__ranges/zip_transform_view.h",
"//third_party/libc++/src/include/__ranges/zip_view.h", "//third_party/libc++/src/include/__ranges/zip_view.h",
"//third_party/libc++/src/include/__split_buffer", "//third_party/libc++/src/include/__split_buffer",
"//third_party/libc++/src/include/__std_mbstate_t.h", "//third_party/libc++/src/include/__std_mbstate_t.h",
@ -1367,7 +1368,6 @@ libcxx_headers = [
"//third_party/libc++/src/include/__tuple/make_tuple_types.h", "//third_party/libc++/src/include/__tuple/make_tuple_types.h",
"//third_party/libc++/src/include/__tuple/sfinae_helpers.h", "//third_party/libc++/src/include/__tuple/sfinae_helpers.h",
"//third_party/libc++/src/include/__tuple/tuple_element.h", "//third_party/libc++/src/include/__tuple/tuple_element.h",
"//third_party/libc++/src/include/__tuple/tuple_indices.h",
"//third_party/libc++/src/include/__tuple/tuple_like.h", "//third_party/libc++/src/include/__tuple/tuple_like.h",
"//third_party/libc++/src/include/__tuple/tuple_like_ext.h", "//third_party/libc++/src/include/__tuple/tuple_like_ext.h",
"//third_party/libc++/src/include/__tuple/tuple_like_no_subrange.h", "//third_party/libc++/src/include/__tuple/tuple_like_no_subrange.h",

View file

@ -84,7 +84,6 @@ create_browser_v8_snapshot_file_name_fuse.patch
feat_configure_launch_options_for_service_process.patch feat_configure_launch_options_for_service_process.patch
feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
preconnect_manager.patch
fix_remove_caption-removing_style_call.patch fix_remove_caption-removing_style_call.patch
build_allow_electron_to_use_exec_script.patch build_allow_electron_to_use_exec_script.patch
chore_introduce_blocking_api_for_electron.patch chore_introduce_blocking_api_for_electron.patch
@ -137,3 +136,4 @@ revert_update_siso-chromium_image.patch
build_set_mac_sdk_minimum_to_10.patch build_set_mac_sdk_minimum_to_10.patch
fix_add_macos_memory_query_fallback_to_avoid_crash.patch fix_add_macos_memory_query_fallback_to_avoid_crash.patch
fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
chore_remove_unused_include_in_preconnect_manager_impl_cc.patch

View file

@ -79,10 +79,10 @@ index b963abd8c4bf6ffaea1930a8d1f647a8a8c266bc..2e8653654686f4fc775288f059ff27da
if (World().IsMainWorld()) { if (World().IsMainWorld()) {
probe::DidCreateMainWorldContext(GetFrame()); probe::DidCreateMainWorldContext(GetFrame());
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
index 1a4500439ffb8ee38b28386e62d96b8011cc892a..e6bc766e971218c3d8def94d1b954d81b4a04a35 100644 index 17d2181db4a0f657aa5052632e3d81f8799d5465..fb565dcbde4c735e101f7bca6eecdc631987c400 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h --- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { @@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>, virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) = 0; int32_t world_id) = 0;
@ -92,7 +92,7 @@ index 1a4500439ffb8ee38b28386e62d96b8011cc892a..e6bc766e971218c3d8def94d1b954d81
int32_t world_id) = 0; int32_t world_id) = 0;
virtual bool AllowScriptExtensions() = 0; virtual bool AllowScriptExtensions() = 0;
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
index 327a013b77c09bd3c7b781d67d8d9ec64807fb5b..51ade9075a184597ed7580a5243ce5ada220ca4c 100644 index 477ddbe72e05e691d807f480717a4b4975a22c01..62c59370129ed0b77bfe67fe5e75ddde96e8ae43 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -295,6 +295,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( @@ -295,6 +295,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(

View file

@ -6,7 +6,7 @@ Subject: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows. This allows us to disable throttling for hidden windows.
diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
index 3b996644e4bdeed5128d6cfb8b5f4fb9ddf4a00f..3c72cd28acbcc57aa086953942175cf33dfbd28a 100644 index d321fe74be7af24d1246224d7a28c9dede3635b2..af2cb60c42863b1fdad487c28d544b7a7dade805 100644
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
@@ -167,6 +167,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast { @@ -167,6 +167,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
@ -116,10 +116,10 @@ index c8d27cfee8ef3fe244291f4667b59df1037c359b..92ed53a689991ec8eca9572bf2f7a212
// Visibility ----------------------------------------------------------- // 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 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 70dad492f1a4f056d2b706a09721090b2752ad8b..f2a332453e3bd421ff563a0b11c1aae5ef185db2 100644 index aae07d5bfdc7dd9020caaa03281c68f9e41080a8..c1d980558293ac6aedcc6ebbf79de5130e0ba22a 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -2493,6 +2493,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( @@ -2482,6 +2482,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal", TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
"old_state", old_state, "new_state", new_state); "old_state", old_state, "new_state", new_state);
@ -130,7 +130,7 @@ index 70dad492f1a4f056d2b706a09721090b2752ad8b..f2a332453e3bd421ff563a0b11c1aae5
bool storing_in_bfcache = new_state->is_in_back_forward_cache && bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
!old_state->is_in_back_forward_cache; !old_state->is_in_back_forward_cache;
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache && bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
@@ -3990,10 +3994,23 @@ PageScheduler* WebViewImpl::Scheduler() const { @@ -3979,10 +3983,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler(); return GetPage()->GetPageScheduler();
} }

View file

@ -8,10 +8,10 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing. 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 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 5cd2f29af7cb7cbb50d88164ab790bc6cadaf456..3c62b85e903efb3bb800d39cba22bf29fe5b76b2 100644 index 92500570c5423dfb655f5d22797c997f35c6b451..bb3f98765c5fcb0d8eadaf4921ae97f832c5e8b9 100644
--- a/base/trace_event/builtin_categories.h --- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h
@@ -123,6 +123,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( @@ -126,6 +126,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
perfetto::Category("drm"), perfetto::Category("drm"),
perfetto::Category("drmcursor"), perfetto::Category("drmcursor"),
perfetto::Category("dwrite"), perfetto::Category("dwrite"),

View file

@ -33,10 +33,10 @@ index 2fb245ad4daabdf430be1f593e73b2da90504419..2f7cd882b6c6d893917b1f7850ee0843
"//base", "//base",
"//build:branding_buildflags", "//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d090c2ac6d075915f7533ddcc3f75608fbaa18ea..29bd19809f7c50187b84fb9e6577df8e9aca8204 100644 index eb9c64fa031f9650229c4f805ba4234b16685dce..070f9dc35630afdc665cef0aa20140072c6d72cc 100644
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4760,7 +4760,7 @@ static_library("browser") { @@ -4761,7 +4761,7 @@ static_library("browser") {
[ "//chrome/browser/ui/webui/signin:profile_impl" ] [ "//chrome/browser/ui/webui/signin:profile_impl" ]
} }
@ -46,10 +46,10 @@ index d090c2ac6d075915f7533ddcc3f75608fbaa18ea..29bd19809f7c50187b84fb9e6577df8e
# than here in :chrome_dll. # than here in :chrome_dll.
deps += [ "//chrome:packed_resources_integrity_header" ] deps += [ "//chrome:packed_resources_integrity_header" ]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index b4592a79623dc2659a75249b716085e88b483955..de666e79b0d5f261ab1528593e0b85b74cae8bb6 100644 index 6a3137e01498f2454ce52b86288cb5c55643a72b..92b10e55d74267866b339124316330ba0bd4809d 100644
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -7458,9 +7458,12 @@ test("unit_tests") { @@ -7456,9 +7456,12 @@ test("unit_tests") {
"//chrome/notification_helper", "//chrome/notification_helper",
] ]
@ -63,7 +63,7 @@ index b4592a79623dc2659a75249b716085e88b483955..de666e79b0d5f261ab1528593e0b85b7
"//chrome//services/util_win:unit_tests", "//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources", "//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests", "//chrome/app:win_unit_tests",
@@ -8391,6 +8394,10 @@ test("unit_tests") { @@ -8389,6 +8392,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
] ]
@ -74,7 +74,7 @@ index b4592a79623dc2659a75249b716085e88b483955..de666e79b0d5f261ab1528593e0b85b7
sources += [ sources += [
# The importer code is not used on Android. # The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc", "../common/importer/firefox_importer_utils_unittest.cc",
@@ -8446,7 +8453,6 @@ test("unit_tests") { @@ -8444,7 +8451,6 @@ test("unit_tests") {
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
deps += [ deps += [
"../browser/screen_ai:screen_ai_install_state", "../browser/screen_ai:screen_ai_install_state",

View file

@ -7,7 +7,7 @@ These are variables we add to the root BUILDCONFIG so that they're available
everywhere, without having to import("//electron/.../flags.gni"). everywhere, without having to import("//electron/.../flags.gni").
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 7b1e29e99375a030c7e654d88da921bf6f95a52b..4c54c15e7c2f60c41b2c72231b5089ac806b06ba 100644 index 5183d7525acbf4f317248b049ea4180ccbec7f0d..0ba04c218f69488eb06c834854cef8cb8af0a5b4 100644
--- a/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") { @@ -123,6 +123,9 @@ if (current_os == "") {

View file

@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores
Makes things like "git status" quicker when developing electron locally Makes things like "git status" quicker when developing electron locally
diff --git a/.gitignore b/.gitignore diff --git a/.gitignore b/.gitignore
index 70e57234120a3096aba70516c257a4227beb31db..ab74f51319d113be4009f89dd064e7694594188e 100644 index a47e3367c85f371097748299b872e40c3e333302..8de26c54b57345121e986dab0bbd33d3842bc511 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -225,6 +225,7 @@ vs-chromium-project.txt @@ -224,6 +224,7 @@ vs-chromium-project.txt
/data /data
/delegate_execute /delegate_execute
/device/serial/device_serial_mojo.xml /device/serial/device_serial_mojo.xml

View file

@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 23 Jul 2025 22:07:13 -0700
Subject: chore: remove unused include in preconnect_manager_impl.cc
This include isn't used but pulls in parts of //chrome that
we don't build, so snip it. This was previously being done
as part of another patch but that patch went away in this
Chromium roll so this is a new patch just to snip it.
This is being upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/6782507
Change-Id: If13767d94f3522e7224f24ea45d6feeab01bafbc
diff --git a/chrome/browser/predictors/preconnect_manager_impl.cc b/chrome/browser/predictors/preconnect_manager_impl.cc
index 58d19bed9ca5004a5322dbbe52e7f1075b2188ea..2dd50c6107590ece770d3a348a32c4996a2a7f83 100644
--- a/chrome/browser/predictors/preconnect_manager_impl.cc
+++ b/chrome/browser/predictors/preconnect_manager_impl.cc
@@ -13,7 +13,6 @@
#include "base/trace_event/trace_event.h"
#include "base/types/optional_util.h"
#include "chrome/browser/predictors/predictors_features.h"
-#include "chrome/browser/predictors/resource_prefetch_predictor.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"

View file

@ -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`. 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 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index c53bea0517ba3e2f7e127a27737240f054d6b6ed..2ed4e422f0ff0f3dd0194f767c976244be02c3d2 100644 index ad93ffc5f17fbff592dc7cfc64aab245de8a296c..75ee8f7ee167b334565dd0976c04a2961fa479c7 100644
--- a/content/app/content_main_runner_impl.cc --- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc
@@ -270,8 +270,13 @@ void AsanProcessInfoCB(const char*, bool*) { @@ -270,8 +270,13 @@ void AsanProcessInfoCB(const char*, bool*) {

View file

@ -6,7 +6,7 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows. 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 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 3cd4d698ef5e302bd2913adfcaffedcf46e9dc8e..eac923378ce1e73f51f182f4dadb7e6f98ee0cfd 100644 index 59431be07a19a274256e328d75191d03c5b717de..09faffd038c9a119ccb8d51ed44569dbd3fed908 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -835,6 +835,10 @@ void RenderWidgetHostImpl::WasHidden() { @@ -835,6 +835,10 @@ void RenderWidgetHostImpl::WasHidden() {

View file

@ -15,7 +15,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work. 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 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 f2a332453e3bd421ff563a0b11c1aae5ef185db2..655fc4ee7a3f38bec066c49ff628616d3e09370d 100644 index c1d980558293ac6aedcc6ebbf79de5130e0ba22a..b4fe66b564f475f1fcda8c00618be655f0ffd85c 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -1884,6 +1884,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, @@ -1884,6 +1884,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,

View file

@ -20,7 +20,7 @@ index afb657b7c9e1ede1273532b16428d37cc5d75c59..16707cf516cd34682c84ea2ccebddaa0
requested_format_.pixel_format = media::PIXEL_FORMAT_NV12; requested_format_.pixel_format = media::PIXEL_FORMAT_NV12;
DCHECK_GT(requested_format_.frame_size.GetArea(), 0); DCHECK_GT(requested_format_.frame_size.GetArea(), 0);
diff --git a/content/browser/media/capture/io_surface_capture_device_base_mac.cc b/content/browser/media/capture/io_surface_capture_device_base_mac.cc diff --git a/content/browser/media/capture/io_surface_capture_device_base_mac.cc b/content/browser/media/capture/io_surface_capture_device_base_mac.cc
index 827264f204eefeef188a568fd4660bdbb65d42a6..c342c8cde09d2392ba14047847fba3aec92802a0 100644 index 7a76550922d97a835dae15be6a951c91a9b351b0..ce3e22e437fa208652326798e12952c40372197a 100644
--- a/content/browser/media/capture/io_surface_capture_device_base_mac.cc --- a/content/browser/media/capture/io_surface_capture_device_base_mac.cc
+++ b/content/browser/media/capture/io_surface_capture_device_base_mac.cc +++ b/content/browser/media/capture/io_surface_capture_device_base_mac.cc
@@ -20,7 +20,7 @@ void IOSurfaceCaptureDeviceBase::AllocateAndStart( @@ -20,7 +20,7 @@ void IOSurfaceCaptureDeviceBase::AllocateAndStart(

View file

@ -348,7 +348,7 @@ index 580fa663e729a43bef44a10de8983c4aecc312fb..f39af3df87786a472f987309ac0dea69
// Whether or not to bind viz::mojom::Gpu to the utility process. // Whether or not to bind viz::mojom::Gpu to the utility process.
bool allowed_gpu_; bool allowed_gpu_;
diff --git a/content/browser/service_host/utility_sandbox_delegate.cc b/content/browser/service_host/utility_sandbox_delegate.cc diff --git a/content/browser/service_host/utility_sandbox_delegate.cc b/content/browser/service_host/utility_sandbox_delegate.cc
index ff9941f1f46658574e8ac53bc80fdf665f873bc0..51dfb23c8ebba7ec075ecab597bd84734773f924 100644 index 8f89c28144e1ecf3d7dbf9a3b43031cbad12a8ea..faa49bb63bd2e9080da441286bdbf427f22cd26f 100644
--- a/content/browser/service_host/utility_sandbox_delegate.cc --- a/content/browser/service_host/utility_sandbox_delegate.cc
+++ b/content/browser/service_host/utility_sandbox_delegate.cc +++ b/content/browser/service_host/utility_sandbox_delegate.cc
@@ -43,17 +43,19 @@ UtilitySandboxedProcessLauncherDelegate:: @@ -43,17 +43,19 @@ UtilitySandboxedProcessLauncherDelegate::

View file

@ -20,7 +20,7 @@ making three primary changes to Blink:
* Controls whether the CSS rule is available. * Controls whether the CSS rule is available.
diff --git a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom diff --git a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
index 10a7bf7440587c732e90e800094ce97d2bb9d10c..dd3ff00b626d7042798c17758473651af9f26742 100644 index e22f8bcb34f86fab48ac2dfb1b2b804d1d13d485..95f63af327359d9b16fd1002a85874c7ea39ac74 100644
--- a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom --- a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
+++ b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom +++ b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
@@ -48,6 +48,7 @@ enum CSSSampleId { @@ -48,6 +48,7 @@ enum CSSSampleId {
@ -45,10 +45,10 @@ index e189d584f05f2ce6354c03a9b19f56985df8a15e..41b430e8f2416be098494f5c49fb97ca
'internal-forced-visited-'): 'internal-forced-visited-'):
internal_visited_order = 0 internal_visited_order = 0
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
index 919f23e8774419a2aeabe39b6cd4d4105046ad54..5e904a2bbb7edf398fdfd737145837c751145036 100644 index da70e0ec00aecfe7eaa861ef9c34aa8165ca296f..1f5a81688fa04fd3574e2678a60e69458089bf88 100644
--- a/third_party/blink/renderer/core/css/css_properties.json5 --- a/third_party/blink/renderer/core/css/css_properties.json5
+++ b/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5
@@ -8939,6 +8939,26 @@ @@ -8959,6 +8959,26 @@
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"], property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
}, },
@ -76,10 +76,10 @@ index 919f23e8774419a2aeabe39b6cd4d4105046ad54..5e904a2bbb7edf398fdfd737145837c7
{ {
name: "-internal-visited-color", name: "-internal-visited-color",
diff --git a/third_party/blink/renderer/core/css/css_property_equality.cc b/third_party/blink/renderer/core/css/css_property_equality.cc diff --git a/third_party/blink/renderer/core/css/css_property_equality.cc b/third_party/blink/renderer/core/css/css_property_equality.cc
index b3c6edce43c4b894f6e93df2f8356416a626c335..f917ff67620e627af21c7f2e9f0605e1f3f97089 100644 index b935117bfbae950ba7918636179824482799a2e1..bab451fbfa36178c9f7286db5d19d087a9df00fa 100644
--- a/third_party/blink/renderer/core/css/css_property_equality.cc --- a/third_party/blink/renderer/core/css/css_property_equality.cc
+++ b/third_party/blink/renderer/core/css/css_property_equality.cc +++ b/third_party/blink/renderer/core/css/css_property_equality.cc
@@ -350,6 +350,8 @@ bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property, @@ -352,6 +352,8 @@ bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property,
return a.DominantBaseline() == b.DominantBaseline(); return a.DominantBaseline() == b.DominantBaseline();
case CSSPropertyID::kDynamicRangeLimit: case CSSPropertyID::kDynamicRangeLimit:
return a.GetDynamicRangeLimit() == b.GetDynamicRangeLimit(); return a.GetDynamicRangeLimit() == b.GetDynamicRangeLimit();
@ -89,10 +89,10 @@ index b3c6edce43c4b894f6e93df2f8356416a626c335..f917ff67620e627af21c7f2e9f0605e1
return a.EmptyCells() == b.EmptyCells(); return a.EmptyCells() == b.EmptyCells();
case CSSPropertyID::kFill: case CSSPropertyID::kFill:
diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
index 2f7d7fbb8d95791dd287170b9f99dd420cfa9487..b705afe19cbb3a39a42a869eb994e7aa976ce98e 100644 index 6cb39c5ccf6b5411e1adb991a5e64a68819ec1c4..b1e636674321d6225755d3be3681a001b0bfaa6d 100644
--- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc --- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
+++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc +++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
@@ -12263,5 +12263,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue( @@ -12262,5 +12262,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
CSSValueID::kNone>(stream); CSSValueID::kNone>(stream);
} }
@ -312,7 +312,7 @@ index 7e3d46902fbf736b4240eb3fcb89975a7b222197..57fdc89fc265ad70cb0bff8443cc1026
auto DrawAsSinglePath = [&]() { auto DrawAsSinglePath = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 52ae779fed980c7fb06d770fd3395d56c247b065..664c87d634730b22369007922c967a4089635197 100644 index a6d35fad5e98c768ad168442592d9756ec53245f..4250093e1766b5e6f3fb3bc2786fd599b4190e6b 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -214,6 +214,10 @@ @@ -214,6 +214,10 @@

View file

@ -131,10 +131,10 @@ index 1632c22c669607f9da8b4fe7783ee716c6467f6e..3f0e3e0af568627a0aae352a65be4cc7
OSStatus AddGenericPassword( OSStatus AddGenericPassword(
std::string_view service_name, std::string_view service_name,
diff --git a/crypto/apple_keychain_secitem.mm b/crypto/apple_keychain_secitem.mm diff --git a/crypto/apple_keychain_secitem.mm b/crypto/apple_keychain_secitem.mm
index 12b400a1f2d6c11bc4ac67d0a2c98984d0be24e0..1abb4623bfabacbca34068113fac2030fea2c065 100644 index 14d72650c81ad7f48cac56cb04f3f75fa1508af5..df416ad2a52c92f8304fa5a40c4d9e67eabb14df 100644
--- a/crypto/apple_keychain_secitem.mm --- a/crypto/apple_keychain_secitem.mm
+++ b/crypto/apple_keychain_secitem.mm +++ b/crypto/apple_keychain_secitem.mm
@@ -118,7 +118,8 @@ @@ -161,7 +161,8 @@
base::expected<std::vector<uint8_t>, OSStatus> base::expected<std::vector<uint8_t>, OSStatus>
AppleKeychainSecItem::FindGenericPassword(std::string_view service_name, AppleKeychainSecItem::FindGenericPassword(std::string_view service_name,

View file

@ -28,11 +28,11 @@ index 33e23680b927d417b0882c7572fe32dc2d2b90c3..9413492f8e0fd6c5371c66329e1ad6d4
// Returns the http referrer of original request which initited this load. // Returns the http referrer of original request which initited this load.
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
index bcf51f743caa1e7da6cb80f2e219661cde0efab6..ddb36c1757ec7e0a3a1f19a2687a1f3e3d590b6e 100644 index a41f344dca8ec3a9004874f4820b742c27999738..222c1d749174e434878cc762625ac8aabe10f5e6 100644
--- a/third_party/blink/renderer/core/loader/document_loader.h --- a/third_party/blink/renderer/core/loader/document_loader.h
+++ b/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -325,7 +325,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>, @@ -322,7 +322,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
soft_navigation_heuristics_task_id, std::optional<scheduler::TaskAttributionId> task_state_id,
bool should_skip_screenshot); bool should_skip_screenshot);
- void SetDefersLoading(LoaderFreezeMode); - void SetDefersLoading(LoaderFreezeMode);

View file

@ -32,10 +32,10 @@ index 62e00207d37fc22b35b801e701d0a1d6c3799569..a946c15689ffcebc1509fdb8fc27c69e
break; break;
} }
diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc
index 8fed0c928df594a80bebf0017d47e1bfef841c16..b9590ecbb95da6858eac104fbf69df056ccbf449 100644 index dc5f30d89dd78af5cfa305bc74ad18dac815caf0..80aa7a3056e275f1a54752e59df5a1c7eb316746 100644
--- a/content/browser/permissions/permission_controller_impl.cc --- a/content/browser/permissions/permission_controller_impl.cc
+++ b/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc
@@ -87,6 +87,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) { @@ -88,6 +88,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) {
case PermissionType::AUTOMATIC_FULLSCREEN: case PermissionType::AUTOMATIC_FULLSCREEN:
case PermissionType::WEB_APP_INSTALLATION: case PermissionType::WEB_APP_INSTALLATION:
case PermissionType::LOCAL_NETWORK_ACCESS: case PermissionType::LOCAL_NETWORK_ACCESS:

View file

@ -44,10 +44,10 @@ index 5018ddade9e6198ad770949696a80ab14482b7e2..5d63cd4e6b33364a1134d4e23eee26e7
// origin of |common_params.url| and/or |common_params.initiator_origin|. // origin of |common_params.url| and/or |common_params.initiator_origin|.
url::Origin resolved_origin = url::Origin::Resolve( 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 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 7b386c451719f164dd1a44efc8fa7132893c48dd..280c488db15f22f807ee8aeb598e85fa8cdb3340 100644 index 3c0e7a6e8e63fd6ca06de278ff8544124e7bb8c8..ff80074db26650f95a1dc5bac7bb90824541426b 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2330,6 +2330,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { @@ -2322,6 +2322,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin( scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
Document* owner_document) { Document* owner_document) {
scoped_refptr<SecurityOrigin> origin; scoped_refptr<SecurityOrigin> origin;
@ -58,7 +58,7 @@ index 7b386c451719f164dd1a44efc8fa7132893c48dd..280c488db15f22f807ee8aeb598e85fa
// Whether the origin is newly created within this call, instead of copied // Whether the origin is newly created within this call, instead of copied
// from an existing document's origin or from `origin_to_commit_`. If this is // from an existing document's origin or from `origin_to_commit_`. If this is
// true, we won't try to compare the nonce of this origin (if it's opaque) to // true, we won't try to compare the nonce of this origin (if it's opaque) to
@@ -2366,6 +2370,9 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin( @@ -2358,6 +2362,9 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
// non-renderer only origin bits will be the same, which will be asserted at // non-renderer only origin bits will be the same, which will be asserted at
// the end of this function. // the end of this function.
origin = origin_to_commit_; origin = origin_to_commit_;

View file

@ -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 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 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index c8e0d79667fe725b360f43352578bc523cc25ef7..76289b9f0ebfb02b0bc6f2177e542d14cf00a967 100644 index 3eb5ee73231e9dfc08a825808e4be5c0ad260234..99f644663e1e1b80fe4ac953dd0c0666697da8c0 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -2137,9 +2137,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { @@ -2137,9 +2137,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {

View file

@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation. 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 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 40441331934df92b9903c005065e6eedcfed69e1..96fc4ccc3f1dd65cf59df4a32adb587193afe6d0 100644 index 560f975e7de98a61387ffae7af416c777665df3b..7bb65739ab1e687c2170c432c5d49cbf9dcf7dc7 100644
--- a/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec
@@ -1547,6 +1547,11 @@ @@ -1543,6 +1543,11 @@
"structures": [10100], "structures": [10100],
}, },

View file

@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
in the browser process. in the browser process.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index c16307602fdb4f3b149962876afd8e3ef76fd305..c53bea0517ba3e2f7e127a27737240f054d6b6ed 100644 index bae4cc39933ab7c565f66e4aad1b19c7e04bd63f..ad93ffc5f17fbff592dc7cfc64aab245de8a296c 100644
--- a/content/app/content_main_runner_impl.cc --- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc
@@ -291,11 +291,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) { @@ -291,11 +291,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {

View file

@ -797,7 +797,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content } // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index a235974eccd4e62e6bc4bf10d37e7057ebc9dd5a..8412aaaae5866994fe2d30c1d5c421ef81343e0d 100644 index 2588b79f726fda56dcc53dc8313a6aa883934409..664ab8325c8b9824077da8cafdfd82d09701809b 100644
--- a/content/test/BUILD.gn --- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -670,6 +670,7 @@ static_library("test_support") { @@ -670,6 +670,7 @@ static_library("test_support") {
@ -817,7 +817,7 @@ index a235974eccd4e62e6bc4bf10d37e7057ebc9dd5a..8412aaaae5866994fe2d30c1d5c421ef
} }
mojom("content_test_mojo_bindings") { mojom("content_test_mojo_bindings") {
@@ -1988,6 +1991,7 @@ test("content_browsertests") { @@ -2002,6 +2005,7 @@ test("content_browsertests") {
"//ui/shell_dialogs", "//ui/shell_dialogs",
"//ui/snapshot", "//ui/snapshot",
"//ui/webui:test_support", "//ui/webui:test_support",
@ -825,7 +825,7 @@ index a235974eccd4e62e6bc4bf10d37e7057ebc9dd5a..8412aaaae5866994fe2d30c1d5c421ef
] ]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3297,6 +3301,7 @@ test("content_unittests") { @@ -3311,6 +3315,7 @@ test("content_unittests") {
"//ui/shell_dialogs:shell_dialogs", "//ui/shell_dialogs:shell_dialogs",
"//ui/webui:test_support", "//ui/webui:test_support",
"//url", "//url",
@ -846,7 +846,7 @@ index ea0d03e4eb473a2eec4164191c02184577de4366..af2d64f0cf19c4325013d5f62da5079f
if (is_mac) { if (is_mac) {
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index e69ef178a08ef322764809e6afeffa20ffc0cd13..d2e182ed0dad5aeecb48e5a39771880bd8fb408b 100644 index 70882e695ad383c9362c9b7e692a9273b3f36801..4ab8d7b3e567e8be373c8dff790d41146c5b8a9d 100644
--- a/device/bluetooth/BUILD.gn --- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn +++ b/device/bluetooth/BUILD.gn
@@ -256,6 +256,7 @@ component("bluetooth") { @@ -256,6 +256,7 @@ component("bluetooth") {
@ -938,10 +938,10 @@ index d288ffce5c1265adbdefc571f840851026e7479e..e9a6e8c31401750d270fcc55ef1116b2
namespace ui { namespace ui {
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 5064c9e21892333cf91579b49642ba500156c201..673e11336c5f5bb350b4622436c80c7299cfb607 100644 index e2e8e314aa5915f6b3be2ea739878d7efcc46efe..aae1bf8e0990792992227199e18c1f14f108c05d 100644
--- a/media/audio/BUILD.gn --- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn
@@ -202,6 +202,7 @@ source_set("audio") { @@ -201,6 +201,7 @@ source_set("audio") {
"CoreMedia.framework", "CoreMedia.framework",
] ]
weak_frameworks = [ "ScreenCaptureKit.framework" ] # macOS 13.0 weak_frameworks = [ "ScreenCaptureKit.framework" ] # macOS 13.0

View file

@ -1,40 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 13 Oct 2022 20:30:12 +0900
Subject: Preconnect manager
* Patch disables the profile related changes added in
https://chromium-review.googlesource.com/c/chromium/src/+/3928470.
diff --git a/chrome/browser/predictors/preconnect_manager_impl.cc b/chrome/browser/predictors/preconnect_manager_impl.cc
index 57d544c0b03c80bdc015ce79d3aa78054d43c6e7..e9547e23d8bb2a5ac120c901405720cbde89737c 100644
--- a/chrome/browser/predictors/preconnect_manager_impl.cc
+++ b/chrome/browser/predictors/preconnect_manager_impl.cc
@@ -13,9 +13,11 @@
#include "base/trace_event/trace_event.h"
#include "base/types/optional_util.h"
#include "chrome/browser/predictors/predictors_features.h"
+#if 0
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
#include "chrome/browser/preloading/preloading_prefs.h"
#include "chrome/browser/profiles/profile.h"
+#endif
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@@ -106,12 +108,15 @@ PreconnectManagerImpl::PreconnectManagerImpl(
PreconnectManagerImpl::~PreconnectManagerImpl() = default;
bool PreconnectManagerImpl::IsEnabled() {
+#if 0
Profile* profile = Profile::FromBrowserContext(browser_context_);
if (!profile) {
return false;
}
return prefetch::IsSomePreloadingEnabled(*profile->GetPrefs()) ==
content::PreloadingEligibility::kEligible;
+#endif
+ return true;
}
base::WeakPtr<PreconnectManager> PreconnectManagerImpl::GetWeakPtr() {

View file

@ -30,7 +30,7 @@ index 18c6ee6657e5edb5e90102dd9a20e5c0efeed843..af763ad4e441e54556854cd40c4cb909
// RenderWidgetHost on the primary main frame, and false otherwise. // RenderWidgetHost on the primary main frame, and false otherwise.
virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*); 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 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index eac923378ce1e73f51f182f4dadb7e6f98ee0cfd..c8e0d79667fe725b360f43352578bc523cc25ef7 100644 index 09faffd038c9a119ccb8d51ed44569dbd3fed908..3eb5ee73231e9dfc08a825808e4be5c0ad260234 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -2071,6 +2071,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { @@ -2071,6 +2071,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {

View file

@ -28,10 +28,10 @@ index a946c15689ffcebc1509fdb8fc27c69e3923a1cb..dffca6d28d2f04cd4c0d722c7c096473
break; break;
} }
diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc
index b9590ecbb95da6858eac104fbf69df056ccbf449..61cdfa6549c539ec73437d221ffdd82fbef39e23 100644 index 80aa7a3056e275f1a54752e59df5a1c7eb316746..056a23bb485356cbe6795e69db9be33b75e26703 100644
--- a/content/browser/permissions/permission_controller_impl.cc --- a/content/browser/permissions/permission_controller_impl.cc
+++ b/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc
@@ -87,7 +87,15 @@ PermissionToSchedulingFeature(PermissionType permission_name) { @@ -88,7 +88,15 @@ PermissionToSchedulingFeature(PermissionType permission_name) {
case PermissionType::AUTOMATIC_FULLSCREEN: case PermissionType::AUTOMATIC_FULLSCREEN:
case PermissionType::WEB_APP_INSTALLATION: case PermissionType::WEB_APP_INSTALLATION:
case PermissionType::LOCAL_NETWORK_ACCESS: case PermissionType::LOCAL_NETWORK_ACCESS:

View file

@ -6,7 +6,7 @@ Subject: Revert "Remove the AllowAggressiveThrottlingWithWebSocket feature."
This reverts commit 615c1810a187840ffeb04096087efff86edb37de. This reverts commit 615c1810a187840ffeb04096087efff86edb37de.
diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
index 2678fd5ec188cb5eac7a5cc493eb4adf7f0434af..a6b77a8284cf92448eb782a02097737985271f04 100644 index b5dde9f0b46663db5c7cf072cc58e271f83995eb..88a503e23ea4fa787a91a2a7934dc1783264a700 100644
--- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
@@ -101,6 +101,17 @@ enum WebSocketOpCode { @@ -101,6 +101,17 @@ enum WebSocketOpCode {

View file

@ -10,10 +10,10 @@ on Windows. We should refactor our code so that this patch isn't
necessary. necessary.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index b087a48440b25561991ce4c4002bf0d9e2acf10e..7bbed72665f0bea9eff33cd4a7412b81621308e8 100644 index 576165f78dc3844a7a109043418d49a4f18415a0..fac211bcda95e2e4ce3c654402cf698d1fe06351 100644
--- a/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -24561,6 +24561,21 @@ @@ -24570,6 +24570,21 @@
] ]
} }
], ],

View file

@ -49,6 +49,7 @@
#include "shell/browser/electron_browser_main_parts.h" #include "shell/browser/electron_browser_main_parts.h"
#include "shell/browser/electron_download_manager_delegate.h" #include "shell/browser/electron_download_manager_delegate.h"
#include "shell/browser/electron_permission_manager.h" #include "shell/browser/electron_permission_manager.h"
#include "shell/browser/electron_preconnect_manager_delegate.h"
#include "shell/browser/file_system_access/file_system_access_permission_context_factory.h" #include "shell/browser/file_system_access/file_system_access_permission_context_factory.h"
#include "shell/browser/media/media_device_id_salt.h" #include "shell/browser/media/media_device_id_salt.h"
#include "shell/browser/net/resolve_proxy_helper.h" #include "shell/browser/net/resolve_proxy_helper.h"
@ -559,7 +560,10 @@ std::string ElectronBrowserContext::GetUserAgent() const {
predictors::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() { predictors::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
if (!preconnect_manager_) { if (!preconnect_manager_) {
preconnect_manager_ = predictors::PreconnectManager::Create(nullptr, this); preconnect_manager_delegate_ =
std::make_unique<ElectronPreconnectManagerDelegate>();
preconnect_manager_ = predictors::PreconnectManager::Create(
preconnect_manager_delegate_->GetWeakPtr(), this);
} }
return preconnect_manager_.get(); return preconnect_manager_.get();
} }

View file

@ -43,6 +43,7 @@ namespace electron {
class CookieChangeNotifier; class CookieChangeNotifier;
class ElectronDownloadManagerDelegate; class ElectronDownloadManagerDelegate;
class ElectronPermissionManager; class ElectronPermissionManager;
class ElectronPreconnectManagerDelegate;
class MediaDeviceIDSalt; class MediaDeviceIDSalt;
class ProtocolRegistry; class ProtocolRegistry;
class ResolveProxyHelper; class ResolveProxyHelper;
@ -192,6 +193,8 @@ class ElectronBrowserContext : public content::BrowserContext {
scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_; scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
scoped_refptr<storage::SpecialStoragePolicy> storage_policy_; scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
std::unique_ptr<predictors::PreconnectManager> preconnect_manager_; std::unique_ptr<predictors::PreconnectManager> preconnect_manager_;
std::unique_ptr<ElectronPreconnectManagerDelegate>
preconnect_manager_delegate_;
std::unique_ptr<ProtocolRegistry> protocol_registry_; std::unique_ptr<ProtocolRegistry> protocol_registry_;
std::optional<std::string> user_agent_; std::optional<std::string> user_agent_;

View file

@ -76,9 +76,5 @@ void ElectronPDFDocumentHelperClient::SetPluginCanSave(
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
void ElectronPDFDocumentHelperClient::OnSearchifyStarted( void ElectronPDFDocumentHelperClient::OnSearchifyStarted(
content::WebContents* contents) { content::RenderFrameHost* render_frame_host) {}
// TODO(crbug.com/360803943): Add test.
// Show the promo only when ScreenAI component is available and OCR can be
// done.
}
#endif #endif

View file

@ -24,7 +24,7 @@ class ElectronPDFDocumentHelperClient : public pdf::PDFDocumentHelperClient {
void SetPluginCanSave(content::RenderFrameHost* render_frame_host, void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
bool can_save) override; bool can_save) override;
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
void OnSearchifyStarted(content::WebContents* contents) override; void OnSearchifyStarted(content::RenderFrameHost* render_frame_host) override;
#endif #endif
}; };

View file

@ -0,0 +1,18 @@
// Copyright (c) 2025 Microsoft, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "shell/browser/electron_preconnect_manager_delegate.h"
namespace electron {
ElectronPreconnectManagerDelegate::ElectronPreconnectManagerDelegate() =
default;
ElectronPreconnectManagerDelegate::~ElectronPreconnectManagerDelegate() =
default;
bool ElectronPreconnectManagerDelegate::IsPreconnectEnabled() {
return true;
}
} // namespace electron

View file

@ -0,0 +1,46 @@
// Copyright (c) 2025 Microsoft, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_PRECONNECT_MANAGER_DELEGATE_H_
#define ELECTRON_SHELL_BROWSER_ELECTRON_PRECONNECT_MANAGER_DELEGATE_H_
#include <memory>
#include "base/memory/weak_ptr.h"
#include "chrome/browser/predictors/preconnect_manager.h"
class GURL;
namespace electron {
class ElectronPreconnectManagerDelegate
: public predictors::PreconnectManager::Delegate {
public:
ElectronPreconnectManagerDelegate();
~ElectronPreconnectManagerDelegate() override;
// disable copy
ElectronPreconnectManagerDelegate(const ElectronPreconnectManagerDelegate&) =
delete;
ElectronPreconnectManagerDelegate& operator=(
const ElectronPreconnectManagerDelegate&) = delete;
// preconnect_manager::Delegate
void PreconnectInitiated(const GURL& url,
const GURL& preconnect_url) override {}
void PreconnectFinished(
std::unique_ptr<predictors::PreconnectStats> stats) override {}
bool IsPreconnectEnabled() override;
base::WeakPtr<ElectronPreconnectManagerDelegate> GetWeakPtr() {
return weak_factory_.GetWeakPtr();
}
private:
base::WeakPtrFactory<ElectronPreconnectManagerDelegate> weak_factory_{this};
};
} // namespace electron
#endif // ELECTRON_SHELL_BROWSER_ELECTRON_PRECONNECT_MANAGER_DELEGATE_H_

View file

@ -321,6 +321,8 @@ ExtensionFunction::ResponseAction TabsQueryFunction::Run() {
tab.active = contents->IsFocused(); tab.active = contents->IsFocused();
tab.audible = contents->IsCurrentlyAudible(); tab.audible = contents->IsCurrentlyAudible();
tab.muted_info = CreateMutedInfo(wc); tab.muted_info = CreateMutedInfo(wc);
// TODO: Add proper support for split views
tab.split_view_id = -1;
result.Append(tab.ToValue()); result.Append(tab.ToValue());
} }
@ -353,6 +355,8 @@ ExtensionFunction::ResponseAction TabsGetFunction::Run() {
tab.active = contents->IsFocused(); tab.active = contents->IsFocused();
tab.last_accessed = wc->GetLastActiveTime().InMillisecondsFSinceUnixEpoch(); tab.last_accessed = wc->GetLastActiveTime().InMillisecondsFSinceUnixEpoch();
// TODO: Add proper support for split views
tab.split_view_id = -1;
return RespondNow(ArgumentList(tabs::Get::Results::Create(std::move(tab)))); return RespondNow(ArgumentList(tabs::Get::Results::Create(std::move(tab))));
} }
@ -696,6 +700,8 @@ ExtensionFunction::ResponseValue TabsUpdateFunction::GetResult() {
tab.active = api_web_contents->IsFocused(); tab.active = api_web_contents->IsFocused();
tab.muted_info = CreateMutedInfo(web_contents_); tab.muted_info = CreateMutedInfo(web_contents_);
tab.audible = web_contents_->IsCurrentlyAudible(); tab.audible = web_contents_->IsCurrentlyAudible();
// TODO: Add proper support for split views
tab.split_view_id = -1;
return ArgumentList(tabs::Get::Results::Create(std::move(tab))); return ArgumentList(tabs::Get::Results::Create(std::move(tab)));
} }

View file

@ -107,7 +107,7 @@ void OffScreenVideoConsumer::OnFrameCaptured(
reinterpret_cast<uintptr_t>(gmb_handle.dxgi_handle().buffer_handle()); reinterpret_cast<uintptr_t>(gmb_handle.dxgi_handle().buffer_handle());
#elif BUILDFLAG(IS_APPLE) #elif BUILDFLAG(IS_APPLE)
texture.shared_texture_handle = texture.shared_texture_handle =
reinterpret_cast<uintptr_t>(gmb_handle.io_surface.get()); reinterpret_cast<uintptr_t>(gmb_handle.io_surface().get());
#elif BUILDFLAG(IS_LINUX) #elif BUILDFLAG(IS_LINUX)
const auto& native_pixmap = gmb_handle.native_pixmap_handle(); const auto& native_pixmap = gmb_handle.native_pixmap_handle();
texture.modifier = native_pixmap.modifier; texture.modifier = native_pixmap.modifier;

View file

@ -61,6 +61,14 @@
// TODO(kalman): Investigate how this is ending up as -1 (based on window type? a bug?) and whether it should be optional instead. // TODO(kalman): Investigate how this is ending up as -1 (based on window type? a bug?) and whether it should be optional instead.
"index": {"type": "integer", "minimum": -1, "description": "The zero-based index of the tab within its window."}, "index": {"type": "integer", "minimum": -1, "description": "The zero-based index of the tab within its window."},
"groupId": {"type": "integer", "minimum": -1, "description": "The ID of the group that the tab belongs to."}, "groupId": {"type": "integer", "minimum": -1, "description": "The ID of the group that the tab belongs to."},
"splitViewId": {
"type": "integer",
"minimum": -1,
"optional": "true",
"description": "The ID of the Split View that the tab belongs to.",
// TODO(crbug.com/433273595): Enable documentation when ready for launch.
"nodoc": "true"
},
"windowId": {"type": "integer", "minimum": 0, "description": "The ID of the window that contains the tab."}, "windowId": {"type": "integer", "minimum": 0, "description": "The ID of the window that contains the tab."},
"openerTabId": {"type": "integer", "minimum": 0, "optional": true, "description": "The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists."}, "openerTabId": {"type": "integer", "minimum": 0, "optional": true, "description": "The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists."},
"selected": {"type": "boolean", "description": "Whether the tab is selected.", "deprecated": "Please use $(ref:tabs.Tab.highlighted)."}, "selected": {"type": "boolean", "description": "Whether the tab is selected.", "deprecated": "Please use $(ref:tabs.Tab.highlighted)."},
@ -524,6 +532,12 @@
"minimum": -1, "minimum": -1,
"description": "The ID of the group that the tabs are in, or $(ref:tabGroups.TAB_GROUP_ID_NONE) for ungrouped tabs." "description": "The ID of the group that the tabs are in, or $(ref:tabGroups.TAB_GROUP_ID_NONE) for ungrouped tabs."
}, },
"splitViewId": {
"type": "integer",
"minimum": -1,
"optional": true,
"description": "The ID of the Split View that the tabs are in, or $(ref:tabs.SPLIT_TAB_ID_NONE) for tabs that aren't in a Split View."
},
"windowId": { "windowId": {
"type": "integer", "type": "integer",
"optional": true, "optional": true,
@ -680,6 +694,12 @@
"minimum": -1, "minimum": -1,
"description": "The tab's new group." "description": "The tab's new group."
}, },
"splitViewId": {
"type": "integer",
"minimum": -1,
"optional": true,
"description": "The tab's new Split View."
},
"pinned": { "pinned": {
"type": "boolean", "type": "boolean",
"optional": true, "optional": true,