mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump chromium to 131.0.6752.0 (main) (#44093)

Browse source 
* chore: bump chromium in DEPS to 131.0.6752.0

* chore: update refactor_expose_cursor_changes_to_the_webcontentsobserver.patch

adjust to upstream #include shear

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

* chore: e patches all

* Remove the <selectlist> prototype implementation

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

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2024-10-02 08:35:18 -07:00 committed by GitHub
parent 5a97ee26ff
commit 59a43ef2e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 59 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = { vars = {
'chromium_version': 'chromium_version':
'131.0.6751.0', '131.0.6752.0',
'node_version': 'node_version':
'v20.17.0', 'v20.17.0',
'nan_version': 'nan_version':

4
patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
View file

@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
This should be upstreamed. This should be upstreamed.
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index d2be94d0d77ef798c888177cd4b882521335059b..8ed6f393da68f6d4ccb951f4d2c951e66e791b8f 100644 index 59ab3b746782c71f7d9401c13a7c866e6e7a823d..f95842da98d3a1d853633b53c745be9c394b25d5 100644
--- a/content/gpu/gpu_main.cc --- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc
@@ -258,6 +258,10 @@ int GpuMain(MainFunctionParams parameters) { @@ -258,6 +258,10 @@ int GpuMain(MainFunctionParams parameters) {
@ -24,7 +24,7 @@ index d2be94d0d77ef798c888177cd4b882521335059b..8ed6f393da68f6d4ccb951f4d2c951e6
// We are experiencing what appear to be memory-stomp issues in the GPU // We are experiencing what appear to be memory-stomp issues in the GPU
// process. These issues seem to be impacting the task executor and listeners // process. These issues seem to be impacting the task executor and listeners
// registered to it. Create the task executor on the heap to guard against // registered to it. Create the task executor on the heap to guard against
@@ -358,7 +362,6 @@ int GpuMain(MainFunctionParams parameters) { @@ -368,7 +372,6 @@ int GpuMain(MainFunctionParams parameters) {
#endif #endif
const bool dead_on_arrival = !init_success; const bool dead_on_arrival = !init_success;

12
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -23,10 +23,10 @@ index ad0092ef2e13853e4bb8b923481559a043b00ab7..1c2dfd23f18733e21312992877ae1499
int32_t world_id) {} int32_t world_id) {}
virtual void DidClearWindowObject() {} virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 89f28a5e8351571d15d6de910a014409494eabb7..3e9b5afc6f8884c55c47656ee9a450ce38a618fe 100644 index ee1753d6b00887dcc0279bcfb95be728aea41ea3..31c5ed77ed0242261b021c397712d8372919800e 100644
--- a/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -4792,6 +4792,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context, @@ -4796,6 +4796,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id); observer.DidCreateScriptContext(context, world_id);
} }
@ -40,10 +40,10 @@ index 89f28a5e8351571d15d6de910a014409494eabb7..3e9b5afc6f8884c55c47656ee9a450ce
int world_id) { int world_id) {
for (auto& observer : observers_) for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index a62e8a85a38d2f131685693f83794a0e0a8ebce9..6260aaa6049bed6f23f83f31b833ec1b311a5a2a 100644 index 7cbbc9c3924f5c37e4d0665b2e3dd961aff227cb..f6bcf5b1dcace172256a49b4745b26cd8354427d 100644
--- a/content/renderer/render_frame_impl.h --- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h
@@ -648,6 +648,8 @@ class CONTENT_EXPORT RenderFrameImpl @@ -651,6 +651,8 @@ class CONTENT_EXPORT RenderFrameImpl
void DidObserveLayoutShift(double score, bool after_input_or_scroll) override; void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
void DidCreateScriptContext(v8::Local<v8::Context> context, void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override; int world_id) override;
@ -53,10 +53,10 @@ index a62e8a85a38d2f131685693f83794a0e0a8ebce9..6260aaa6049bed6f23f83f31b833ec1b
int world_id) override; int world_id) override;
void DidChangeScrollOffset() override; void DidChangeScrollOffset() override;
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
index a8e13d160c1ec6944385d6272b7d44dc9f2f7c43..16a5fb0786f1a349f13428aedd1dc1a7bd983f7f 100644 index 26c92021ceb5dc5cead46f9dcb8c73dc502bcc8b..9a6984cffc8ff24e9c5caf9dae2b1b65595edb94 100644
--- a/third_party/blink/public/web/web_local_frame_client.h --- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -664,6 +664,9 @@ class BLINK_EXPORT WebLocalFrameClient { @@ -665,6 +665,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>, virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {} int32_t world_id) {}

4
patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
View file

@ -8,10 +8,10 @@ decorations in maximized mode where needed, preventing empty space caused
by decoration shadows and rounded titlebars around the window while maximized. by decoration shadows and rounded titlebars around the window while maximized.
diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
index 5cf15029941218d5005d720aad65fb14c1d30235..02b280ca776c91b506b0eafba66a6a14dcda0691 100644 index 69fdf309dbb71e1d2a2d258d15df1ffde3b14841..57052ded8b7d52932b1a217c2f6cb97abd65c2a5 100644
--- a/ui/gtk/gtk_ui.cc --- a/ui/gtk/gtk_ui.cc
+++ b/ui/gtk/gtk_ui.cc +++ b/ui/gtk/gtk_ui.cc
@@ -581,11 +581,12 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() { @@ -584,11 +584,12 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
} }
ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame, ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame,

6
patches/chromium/blink_local_frame.patch
View file

@ -15,10 +15,10 @@ Refs changes in:
This patch reverts the changes to fix associated crashes in Electron. This patch reverts the changes to fix associated crashes in Electron.
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
index 6210eae2b7c25dae24ad7087d3e0ac494dada375..934ee55c89c526ca8fa390a13c4dd79b1c85882f 100644 index 2f33ec660a975522c473ecd50e633b5edaca707f..65221a51927d9f44bd6adbad88fa1144f2db3add 100644
--- a/third_party/blink/renderer/core/frame/frame.cc --- a/third_party/blink/renderer/core/frame/frame.cc
+++ b/third_party/blink/renderer/core/frame/frame.cc +++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -131,14 +131,6 @@ bool Frame::Detach(FrameDetachType type) { @@ -135,14 +135,6 @@ bool Frame::Detach(FrameDetachType type) {
DCHECK(!IsDetached()); DCHECK(!IsDetached());
@ -33,7 +33,7 @@ index 6210eae2b7c25dae24ad7087d3e0ac494dada375..934ee55c89c526ca8fa390a13c4dd79b
if (type == FrameDetachType::kRemove) { if (type == FrameDetachType::kRemove) {
if (provisional_frame_) { if (provisional_frame_) {
provisional_frame_->Detach(FrameDetachType::kRemove); provisional_frame_->Detach(FrameDetachType::kRemove);
@@ -162,6 +154,14 @@ bool Frame::Detach(FrameDetachType type) { @@ -166,6 +158,14 @@ bool Frame::Detach(FrameDetachType type) {
GetWindowProxyManager()->ClearForSwap(); GetWindowProxyManager()->ClearForSwap();
} }

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index 751a3087c4a06f9f03373f890b3400621680089d..ea7bf129c8ad67c9c84fc86e972eecfa
"//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 5d6279f81ff516a5ae14b86c3020cc00db9b4869..760a016c3436935c195edcd6e05a26d2738cd70e 100644 index 5c279715b863215a9d34272cdeea5b58beaedfce..732ec6aaf297def2925dcc35417ab351c49dcbf1 100644
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4513,7 +4513,7 @@ static_library("browser") { @@ -4528,7 +4528,7 @@ static_library("browser") {
] ]
} }
@ -46,10 +46,10 @@ index 5d6279f81ff516a5ae14b86c3020cc00db9b4869..760a016c3436935c195edcd6e05a26d2
# 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 caec8e1ba7fd4f282f2d22e2a964b1b8c416b46e..f7839bb0a20197429dba7a0fe83651f69a07d2d6 100644 index d7e7f17b2fa2119a3781e0bc085988284bdce814..b4788192fc02716ac8f8bb6bd693ac89bad85291 100644
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -7113,9 +7113,12 @@ test("unit_tests") { @@ -7116,9 +7116,12 @@ test("unit_tests") {
"//chrome/notification_helper", "//chrome/notification_helper",
] ]
@ -63,7 +63,7 @@ index caec8e1ba7fd4f282f2d22e2a964b1b8c416b46e..f7839bb0a20197429dba7a0fe83651f6
"//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",
@@ -8085,6 +8088,10 @@ test("unit_tests") { @@ -8077,6 +8080,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 caec8e1ba7fd4f282f2d22e2a964b1b8c416b46e..f7839bb0a20197429dba7a0fe83651f6
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",
@@ -8137,7 +8144,6 @@ test("unit_tests") { @@ -8129,7 +8136,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target. # Non-android deps for "unit_tests" target.
deps += [ deps += [
"../browser/screen_ai:screen_ai_install_state", "../browser/screen_ai:screen_ai_install_state",

10
patches/chromium/can_create_window.patch
View file

@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken. TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index ddc36fb4afa05887c6fb702884f459f39d45c341..94784b4bc3e212755d1c371e2b6c2f259ea4542e 100644 index 86c862dd1976a77fcfd70a44ef63839a4b4c70e8..744715d8ecc1ddca8400ae88e115e52797df1ffa 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9070,6 +9070,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -9067,6 +9067,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type, last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(), params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features, params->frame_name, params->disposition, *params->features,
@ -21,7 +21,7 @@ index ddc36fb4afa05887c6fb702884f459f39d45c341..94784b4bc3e212755d1c371e2b6c2f25
&no_javascript_access); &no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0478cc0a443c32ed30afb350d70cad27cd2d05c5..3d0827092ac2a0c0a1416aa40c69ea4d2bc831ac 100644 index 005138eef91d9b5b2e44478312deda8ea3ce8cfc..ef9109104139a7df3b16ed42e839666b05fd756f 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4771,6 +4771,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4771,6 +4771,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@ -148,10 +148,10 @@ index 294dc13ec8f27875c28b459b56b166f2c8f4a2ff..1a58077807de673e1937f3323c8dc37b
// typically happens when popups are created. // typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents, virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index edcc9e240ab6d8660d8bfd873ca89b36219b722d..89f28a5e8351571d15d6de910a014409494eabb7 100644 index 6a69e532bf8056ef2fc3f8f215407e92268f00c9..ee1753d6b00887dcc0279bcfb95be728aea41ea3 100644
--- a/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -6835,6 +6835,10 @@ WebView* RenderFrameImpl::CreateNewWindow( @@ -6854,6 +6854,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
request.HasUserGesture(), GetWebFrame()->IsAdFrame(), request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
GetWebFrame()->IsAdScriptInStack()); GetWebFrame()->IsAdScriptInStack());

2
patches/chromium/chore_partial_revert_of.patch
View file

@ -14,7 +14,7 @@ track down the source of this problem & figure out if we can fix it
by changing something in Electron. by changing something in Electron.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7524e102076144998408a673412e824494c45562..b8c878b9ae9838a75998312ce1371260f74c9f62 100644 index 8ff4173be99dea55a927385ce40f9e7df2cdb8ef..fc725ed64bdd603e80f6dc81a0f1591c767310db 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4697,9 +4697,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4697,9 +4697,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -218,7 +218,7 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
content::WebContents* AddNewContents( content::WebContents* AddNewContents(
content::WebContents* source, content::WebContents* source,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index fdd19e13832ebd3146a9f8c09109d776081837ef..01dfe2627cab05123516aae2fbaa4773432bdbbf 100644 index e67eadd2877ba992c55e7226c9af1e9369d6caa5..86e0677b15bcc855f8376f87618ec557b4ef7b40 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4666,8 +4666,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4666,8 +4666,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
View file

@ -311,7 +311,7 @@ index 128bca8bb64113418551a20164f67ef5e5a88253..93f86ec79364db1f46c5d2eb015a11cf
// Although ScreenCaptureKit is available in 12.3 there were some bugs that // Although ScreenCaptureKit is available in 12.3 there were some bugs that
diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
index 01f082fc05e70246a8c0626897df306816d93687..67cf9fd1d3d366fa08e24fba9eb18ae22852c817 100644 index 5b76ef79789414fd1f18b0629873e7722c9fbd1c..fff10d51944ba27556b97abc3222308e440645cd 100644
--- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc --- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
+++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
@@ -329,8 +329,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync( @@ -329,8 +329,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(

8
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -112,10 +112,10 @@ index 3450c15835d8b792f37764f6edc4a4560be435ef..b1034aa141d6121f8e1524fb34a28a04
string mime_type; string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 2b6a5854cf912d38aac207a4c74504b00aa7c97e..c8cbd70306f04f025ba7e9d121bb2287929f2d5c 100644 index 6434cd76b2fc0593448471a63652c0ddc56fe3ed..33b531855e2e7328fc559f10c4ad7b3f7af2e28e 100644
--- a/services/network/url_loader.cc --- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc +++ b/services/network/url_loader.cc
@@ -725,6 +725,7 @@ URLLoader::URLLoader( @@ -726,6 +726,7 @@ URLLoader::URLLoader(
request.trusted_params->allow_cookies_from_browser; request.trusted_params->allow_cookies_from_browser;
include_request_cookies_with_response_ = include_request_cookies_with_response_ =
request.trusted_params->include_request_cookies_with_response; request.trusted_params->include_request_cookies_with_response;
@ -123,7 +123,7 @@ index 2b6a5854cf912d38aac207a4c74504b00aa7c97e..c8cbd70306f04f025ba7e9d121bb2287
} }
// Store any cookies passed from the browser process to later attach them to // Store any cookies passed from the browser process to later attach them to
@@ -763,7 +764,7 @@ URLLoader::URLLoader( @@ -762,7 +763,7 @@ URLLoader::URLLoader(
&URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this))); &URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this)));
} }
@ -132,7 +132,7 @@ index 2b6a5854cf912d38aac207a4c74504b00aa7c97e..c8cbd70306f04f025ba7e9d121bb2287
url_request_->SetResponseHeadersCallback(base::BindRepeating( url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this))); &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
} }
@@ -1738,6 +1739,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { @@ -1737,6 +1738,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
} }
response_ = BuildResponseHead(); response_ = BuildResponseHead();

6
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -40,10 +40,10 @@ index 6e329572b72d5c76e0c78204c9eb98346626c543..55dde123a54068e6e0ffc5c98f6ae5ce
// 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 7980748f0259dd9a87aee30c6fec771369b505a8..d435f8cb5d98a056ab05fab23ad4f871419a4e32 100644 index 37272602835da25fc3b26eedb72d1786af3487fc..6dd8e7f6bd987ecda0d3908e2f66af65f6931682 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
@@ -2261,6 +2261,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() { @@ -2264,6 +2264,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;
@ -54,7 +54,7 @@ index 7980748f0259dd9a87aee30c6fec771369b505a8..d435f8cb5d98a056ab05fab23ad4f871
StringBuilder debug_info_builder; StringBuilder debug_info_builder;
// 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
@@ -2314,6 +2318,10 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin( @@ -2317,6 +2321,10 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
// the end of this function. // the end of this function.
origin = origin_to_commit_; origin = origin_to_commit_;
debug_info_builder.Append("use_origin_to_commit"); debug_info_builder.Append("use_origin_to_commit");

4
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
View file

@ -87,10 +87,10 @@ index 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed
// The view with active text input state, i.e., a focused <input> element. // The view with active text input state, i.e., a focused <input> element.
// It will be nullptr if no such view exists. Note that the active view // It will be nullptr if no such view exists. Note that the active view
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 356fcf21258dbdc8db38611a47fd920552d6851a..7524e102076144998408a673412e824494c45562 100644 index 2737b01ebb915b1c04524def18cbd4a5395f034a..8ff4173be99dea55a927385ce40f9e7df2cdb8ef 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -9223,7 +9223,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( @@ -9225,7 +9225,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame", "WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame); "render_frame_host", frame);
RenderWidgetHostViewBase* root_view = RenderWidgetHostViewBase* root_view =

6
patches/chromium/fix_properly_honor_printing_page_ranges.patch
View file

@ -25,10 +25,10 @@ index 5b469b3b6bd11d8e0baa08e9be257990ac9bc438..c1410e5d8112f0319de40e4fbf41dbae
// Returns true if duplex mode is set. // Returns true if duplex mode is set.
bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode); bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index e724e46e422be25ddab8b94d03324832ab08e518..b5c4c9c41607d55d89a1ee6831848d4ecc4b06be 100644 index f39f8b2dd3aa2b89498ed5331aa9b9ba6a02abf5..c0e155c14b2b4e81cde35cea1db284bc4c43f5e6 100644
--- a/printing/printing_context_mac.mm --- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm +++ b/printing/printing_context_mac.mm
@@ -527,7 +527,8 @@ bool IsIppColorModelColorful(mojom::ColorModel color_model) { @@ -520,7 +520,8 @@ bool IsIppColorModelColorful(mojom::ColorModel color_model) {
!SetCollateInPrintSettings(settings_->collate()) || !SetCollateInPrintSettings(settings_->collate()) ||
!SetDuplexModeInPrintSettings(settings_->duplex_mode()) || !SetDuplexModeInPrintSettings(settings_->duplex_mode()) ||
!SetOutputColor(static_cast<int>(settings_->color())) || !SetOutputColor(static_cast<int>(settings_->color())) ||
@ -38,7 +38,7 @@ index e724e46e422be25ddab8b94d03324832ab08e518..b5c4c9c41607d55d89a1ee6831848d4e
return OnError(); return OnError();
} }
} }
@@ -680,6 +681,22 @@ bool IsIppColorModelColorful(mojom::ColorModel color_model) { @@ -673,6 +674,22 @@ bool IsIppColorModelColorful(mojom::ColorModel color_model) {
return PMSetCopies(print_settings, copies, false) == noErr; return PMSetCopies(print_settings, copies, false) == noErr;
} }

4
patches/chromium/frame_host_manager.patch
View file

@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
Allows embedder to intercept site instances created by chromium. Allows embedder to intercept site instances created by chromium.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index f53b59ece0ebe8587dfd64f4e726833e301e2d92..34867e20ef280eeabedec9a4cb2324e147a78732 100644 index 52a933c1068083bb5d5f26eef4e77f8bc6b904b8..8b79682b2e8bfe52251afb68e426b421c4707718 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc --- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -4523,6 +4523,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( @@ -4524,6 +4524,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange(); request->ResetStateForSiteInstanceChange();
} }

4
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
View file

@ -771,7 +771,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 0d788588129e6daac4474d4da7e8a12934d849a0..c5004913227aaa9791985138baae964fe929dde7 100644 index 2cfb947c33e8479467b4aae213ee58b16fd42326..d235cf3d40a5804b7681160cf0c6ed4c4843c0d3 100644
--- a/content/test/BUILD.gn --- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -638,6 +638,7 @@ static_library("test_support") { @@ -638,6 +638,7 @@ static_library("test_support") {
@ -798,7 +798,7 @@ index 0d788588129e6daac4474d4da7e8a12934d849a0..c5004913227aaa9791985138baae964f
] ]
if (!(is_chromeos_ash && target_cpu == "arm64" && current_cpu == "arm")) { if (!(is_chromeos_ash && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3210,6 +3213,7 @@ test("content_unittests") { @@ -3211,6 +3214,7 @@ test("content_unittests") {
"//ui/latency:test_support", "//ui/latency:test_support",
"//ui/shell_dialogs:shell_dialogs", "//ui/shell_dialogs:shell_dialogs",
"//ui/webui:test_support", "//ui/webui:test_support",

4
patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
View file

@ -10,10 +10,10 @@ an about:blank check to this area.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index caf1d967e649845012fb98749918f6f7582bf6ed..705acf5b4b836d69571028997db2a697c194a165 100644 index e2da85a2a7719f77eea3209a47dca58bd9512a4c..c8ac1186d8e226c7357c388d95fa543c5f009008 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -782,8 +782,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( @@ -783,8 +783,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
// TODO(crbug.com/40092527): Consider adding a separate boolean that // TODO(crbug.com/40092527): Consider adding a separate boolean that
// tracks this instead of piggybacking `origin_calculation_debug_info`. // tracks this instead of piggybacking `origin_calculation_debug_info`.
if (renderer_side_origin.opaque() && if (renderer_side_origin.opaque() &&

16
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -44,10 +44,10 @@ index 5472056b3731569737df69b62fa7c75c4ffe18a8..23fba344bb82ca317db3141ac5def321
void RenderWidgetHostImpl::ShowContextMenuAtPoint( void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3d0827092ac2a0c0a1416aa40c69ea4d2bc831ac..fdd19e13832ebd3146a9f8c09109d776081837ef 100644 index ef9109104139a7df3b16ed42e839666b05fd756f..e67eadd2877ba992c55e7226c9af1e9369d6caa5 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5481,6 +5481,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -5483,6 +5483,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get(); return text_input_manager_.get();
} }
@ -60,10 +60,10 @@ index 3d0827092ac2a0c0a1416aa40c69ea4d2bc831ac..fdd19e13832ebd3146a9f8c09109d776
RenderWidgetHostImpl* render_widget_host) { RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost(); return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 8f4686ffada75909661e8f0e0bafa87a6c49c721..ac64f566ad667a1a8cb6dd264b1b22d1149a6eb6 100644 index 978d1b7d03a68a02da4beca9d70536715a076e3a..0abae9d12464670b707db3b9ec0e5fb8d159159e 100644
--- a/content/browser/web_contents/web_contents_impl.h --- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h
@@ -1116,6 +1116,7 @@ class CONTENT_EXPORT WebContentsImpl @@ -1118,6 +1118,7 @@ class CONTENT_EXPORT WebContentsImpl
void SendScreenRects() override; void SendScreenRects() override;
void SendActiveState(bool active) override; void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override; TextInputManager* GetTextInputManager() override;
@ -72,18 +72,18 @@ index 8f4686ffada75909661e8f0e0bafa87a6c49c721..ac64f566ad667a1a8cb6dd264b1b22d1
RenderWidgetHostImpl* render_widget_host) override; RenderWidgetHostImpl* render_widget_host) override;
bool IsShowingContextMenuOnPage() const override; bool IsShowingContextMenuOnPage() const override;
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 2c6a8fd71f1495f5557cdc318996bf25834dca77..af1ca5b331e9c8870723f028e4c59e48d837927f 100644 index 58e3918a83b1adbd37b8cffc98fd667b71c53442..43362728bacd4cd7a28c0e792351082a82e0ab0d 100644
--- a/content/public/browser/web_contents_observer.h --- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h
@@ -35,6 +35,7 @@ @@ -36,6 +36,7 @@
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-forward.h"
#include "third_party/blink/public/mojom/media/capture_handle_config.mojom-forward.h" #include "third_party/blink/public/mojom/media/capture_handle_config.mojom-forward.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "ui/accessibility/ax_location_and_scroll_updates.h"
+#include "ui/base/cursor/cursor.h" +#include "ui/base/cursor/cursor.h"
#include "ui/base/page_transition_types.h" #include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h" #include "ui/base/window_open_disposition.h"
@@ -627,6 +628,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { @@ -628,6 +629,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
// Invoked when the primary main frame changes size. // Invoked when the primary main frame changes size.
virtual void PrimaryMainFrameWasResized(bool width_changed) {} virtual void PrimaryMainFrameWasResized(bool width_changed) {}

2
patches/chromium/web_contents.patch
View file

@ -9,7 +9,7 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226. Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 01dfe2627cab05123516aae2fbaa4773432bdbbf..caa0f109c9b7200ba04525c54935108d53712f87 100644 index 86e0677b15bcc855f8376f87618ec557b4ef7b40..67bf198cc11cbfd89f6535b2a23783c3ae0985be 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3650,6 +3650,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3650,6 +3650,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,

6
patches/chromium/webview_fullscreen.patch
View file

@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value. `api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 94784b4bc3e212755d1c371e2b6c2f259ea4542e..caf1d967e649845012fb98749918f6f7582bf6ed 100644 index 744715d8ecc1ddca8400ae88e115e52797df1ffa..e2da85a2a7719f77eea3209a47dca58bd9512a4c 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8185,6 +8185,17 @@ void RenderFrameHostImpl::EnterFullscreen( @@ -8182,6 +8182,17 @@ void RenderFrameHostImpl::EnterFullscreen(
} }
} }
@ -37,7 +37,7 @@ index 94784b4bc3e212755d1c371e2b6c2f259ea4542e..caf1d967e649845012fb98749918f6f7
if (had_fullscreen_token && !GetView()->HasFocus()) if (had_fullscreen_token && !GetView()->HasFocus())
GetView()->Focus(); GetView()->Focus();
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index caa0f109c9b7200ba04525c54935108d53712f87..356fcf21258dbdc8db38611a47fd920552d6851a 100644 index 67bf198cc11cbfd89f6535b2a23783c3ae0985be..2737b01ebb915b1c04524def18cbd4a5395f034a 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3905,21 +3905,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( @@ -3905,21 +3905,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(

2
patches/v8/deps_add_v8_object_setinternalfieldfornodecore.patch
View file

@ -46,7 +46,7 @@ index 71a6c2c9c149116caa410d25aef4087774b81b44..ad8416ea2500f10aad31f25da96b235f
V8_INLINE static void* GetAlignedPointerFromInternalField( V8_INLINE static void* GetAlignedPointerFromInternalField(
const BasicTracedReference<Object>& object, int index) { const BasicTracedReference<Object>& object, int index) {
diff --git a/src/api/api.cc b/src/api/api.cc diff --git a/src/api/api.cc b/src/api/api.cc
index 6aa29b3512bf4c39617b71e7398b147f09304f33..07caf2ad8666a6c399b3f3ed39bb7d0132a1db7a 100644 index 4adaabebe6bd804db0910cea6ff090ef86cb74fc..27e307c774c09ca1c8f2c72d5b3629dd336760a2 100644
--- a/src/api/api.cc --- a/src/api/api.cc
+++ b/src/api/api.cc +++ b/src/api/api.cc
@@ -6398,14 +6398,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) { @@ -6398,14 +6398,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) {

6
shell/common/gin_converters/blink_converter.cc
View file

@ -477,9 +477,6 @@ Converter<std::optional<blink::mojom::FormControlType>>::ToV8(
case blink::mojom::FormControlType::kButtonReset: case blink::mojom::FormControlType::kButtonReset:
str = "reset-button"; str = "reset-button";
break; break;
case blink::mojom::FormControlType::kButtonSelectList:
str = "select-list";
break;
case blink::mojom::FormControlType::kButtonSubmit: case blink::mojom::FormControlType::kButtonSubmit:
str = "submit-button"; str = "submit-button";
break; break;
@ -555,9 +552,6 @@ Converter<std::optional<blink::mojom::FormControlType>>::ToV8(
case blink::mojom::FormControlType::kOutput: case blink::mojom::FormControlType::kOutput:
str = "output"; str = "output";
break; break;
case blink::mojom::FormControlType::kSelectList:
str = "select-list";
break;
case blink::mojom::FormControlType::kSelectMultiple: case blink::mojom::FormControlType::kSelectMultiple:
str = "select-multiple"; str = "select-multiple";
break; break;