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

chore: bump chromium to 131.0.6750.0 (main) (#44066)

Browse source 
* chore: bump chromium in DEPS to 131.0.6750.0

* Clean up stale base::Feature "RestrictFileURLNavigation"

Xref: 5891262

* chore: update mas_avoid_private_macos_api_usage.patch

Comment out some new private macOS API use.

Xref: 5837702

Xref: https://electronhq.slack.com/archives/C5VT8SQ8K/p1727807285899389

* chore: e patches all

---------

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-01 19:34:32 -04:00 • committed by GitHub
parent f4ffd018e6
commit 1fc2064f6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 110 additions and 101 deletions
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 = {
'chromium_version':
'131.0.6748.0',
'131.0.6750.0',
'node_version':
'v20.17.0',
'nan_version':

8
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
View file

@ -23,10 +23,10 @@ index e392efaf2e1ac3cfbef2d787ba40f0491b67f3cc..d45c7570484a7c1bfca25c860a1ddd2d
return receiver_.BindNewEndpointAndPassDedicatedRemote();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index f130879c92319b525f5a521c3a083f479b485d2e..af42b58b78beff2349deadf68c51a3d4a310ac58 100644
index 52ce9d2c8c5e29b8dce26116c04dac087b83571d..1c9573708b1b27cffaac175740e1ed826c8115ec 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -753,6 +753,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -746,6 +746,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
}
@ -39,10 +39,10 @@ index f130879c92319b525f5a521c3a083f479b485d2e..af42b58b78beff2349deadf68c51a3d4
return is_active();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index fe60e694fa35e5c46ce49dd9617ad33d73708912..df13884877ac87e414749dfec5db8ff83c1640ba 100644
index 961e55732d9c3aa5437e9cc6eca7a2c8d06bd335..f0fc8d303dc9de2419d5f5d769657faf98caa22a 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -139,6 +139,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl
void EnablePreferredSizeMode() override;
void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
patch.
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 6193a1017c888a5b1187f25f858b9af5930063bb..4421014867944cd67c0072777c9f36badb8f1e3e 100644
index 751a3087c4a06f9f03373f890b3400621680089d..ea7bf129c8ad67c9c84fc86e972eecfa0a80ad5d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -204,11 +204,16 @@ if (!is_android && !is_mac) {
@ -33,10 +33,10 @@ index 6193a1017c888a5b1187f25f858b9af5930063bb..4421014867944cd67c0072777c9f36ba
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 562234d7b46a33cb652a7ecf8dbd0d438880020a..8d98d36ad409dbb45849eda49018ad170e1ef40e 100644
index 5d6279f81ff516a5ae14b86c3020cc00db9b4869..760a016c3436935c195edcd6e05a26d2738cd70e 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4501,7 +4501,7 @@ static_library("browser") {
@@ -4513,7 +4513,7 @@ static_library("browser") {
]
}
@ -46,10 +46,10 @@ index 562234d7b46a33cb652a7ecf8dbd0d438880020a..8d98d36ad409dbb45849eda49018ad17
# than here in :chrome_dll.
deps += [ "//chrome:packed_resources_integrity_header" ]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 1825ba2f5b7b48c269be02292fe7ce001c65ba9e..ec8b15716191074597c498e17813331485f2a8cd 100644
index caec8e1ba7fd4f282f2d22e2a964b1b8c416b46e..f7839bb0a20197429dba7a0fe83651f69a07d2d6 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7119,9 +7119,12 @@ test("unit_tests") {
@@ -7113,9 +7113,12 @@ test("unit_tests") {
"//chrome/notification_helper",
]
@ -63,7 +63,7 @@ index 1825ba2f5b7b48c269be02292fe7ce001c65ba9e..ec8b15716191074597c498e178133314
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -8105,6 +8108,10 @@ test("unit_tests") {
@@ -8085,6 +8088,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
]
@ -74,7 +74,7 @@ index 1825ba2f5b7b48c269be02292fe7ce001c65ba9e..ec8b15716191074597c498e178133314
sources += [
# The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc",
@@ -8157,7 +8164,6 @@ test("unit_tests") {
@@ -8137,7 +8144,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
"../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.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 40b4ae587e5c10c164e0d24ecd0c009bb95d4611..556086106747673de32486df2e82f98f165a9156 100644
index ddc36fb4afa05887c6fb702884f459f39d45c341..94784b4bc3e212755d1c371e2b6c2f259ea4542e 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9074,6 +9074,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -9070,6 +9070,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index 40b4ae587e5c10c164e0d24ecd0c009bb95d4611..556086106747673de32486df2e82f98f
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a8bb15f59d46ec5e2e71e16181f4dd1156a137c7..1dc6de327d29fe89486ef84c2ccea96bb38136b5 100644
index 0478cc0a443c32ed30afb350d70cad27cd2d05c5..3d0827092ac2a0c0a1416aa40c69ea4d2bc831ac 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4865,6 +4865,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4771,6 +4771,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
opener);
@ -37,7 +37,7 @@ index a8bb15f59d46ec5e2e71e16181f4dd1156a137c7..1dc6de327d29fe89486ef84c2ccea96b
// If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4906,12 +4912,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4812,12 +4818,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}

2
patches/chromium/chore_introduce_blocking_api_for_electron.patch
View file

@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
of explicitly adding ScopedAllowBlocking calls as friends.
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 0cddd96b731dd6b4f2829b7284171cc43a2d1702..d0fd45bf6db6ba34a69e6d60172b3e980e9188ca 100644
index 965206e18e7a536947354c734ef17196c3e736ff..8a8a687d33f725aacf736a20ffc600cdf3fb05e4 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -132,6 +132,7 @@ class KeyStorageLinux;

4
patches/chromium/chore_partial_revert_of.patch
View file

@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
by changing something in Electron.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 18410cd178e80967daa0969ec8b641feb9624c9a..94074676f4b7fcbf2a3ea7a9854ec20d39d9fede 100644
index 7524e102076144998408a673412e824494c45562..b8c878b9ae9838a75998312ce1371260f74c9f62 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4791,9 +4791,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4697,9 +4697,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
bool renderer_started_hidden =
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;

2
patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch
View file

@ -14,7 +14,7 @@ This change patches it out to prevent the DCHECK.
It can be removed once/if we see a better solution to the problem.
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 05814643c905cf14068de87d47914b5fd315264e..9af1584d933af2c72fc5f63fcca86cc001a81aad 100644
index ebe21d861ba3c7725f22d8c59738e49856c030ca..c2fc12ea2d5a4f7e6b33546d2a5e0bcbbe4e4c9d 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -210,7 +210,7 @@ scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::CreateForGuest(

4
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
content::WebContents* AddNewContents(
content::WebContents* source,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9e79f504a18e943d56ef02d2424403e0acbe157e..dd2f2912bd76e43a08dd5149c13a1b49b1565290 100644
index fdd19e13832ebd3146a9f8c09109d776081837ef..01dfe2627cab05123516aae2fbaa4773432bdbbf 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4760,8 +4760,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4666,8 +4666,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,

6
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
View file

@ -95,10 +95,10 @@ index f482ce44b4339e0cf2a57a6a4f9db4d1be5fa178..49604d211b4d406fd59e7da3c4a648dd
friend class ContentClientCreator;
friend class ContentClientInitializer;
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index e306ccd3a19b0cba92ed902c179c920f0e4d1faa..2470da09803fc56d6eafff53df3a3ef76d4fa2ce 100644
index 8e806321258f010d6f084e65b791d725735fb951..ed2dda8326eb3826a068d5268be6d8cfc5a547f6 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -594,8 +594,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
@@ -662,8 +662,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
@ -108,7 +108,7 @@ index e306ccd3a19b0cba92ed902c179c920f0e4d1faa..2470da09803fc56d6eafff53df3a3ef7
if (g_mapped_snapshot) {
// TODO(crbug.com/40558459): Confirm not loading different type of snapshot
// files in a process.
@@ -604,10 +603,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
@@ -672,10 +671,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
base::MemoryMappedFile::Region file_region;
base::File file =

2
patches/chromium/disable_compositor_recycling.patch
View file

@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index e3c4075e4aa4a2bf854f5308f25775bd10ce32dc..6b5f96f0f9480fcb2c79fff37ed89fd4be057c5c 100644
index 69eb2ad17a15a17ca274a3a3128de9b841061a95..8eb231302c35ac6de1bfdfd53019287723cf40ed 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -559,7 +559,11 @@

4
patches/chromium/disable_hidden.patch
View file

@ -6,7 +6,7 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 35a8d11c3a929cb9a026eebbb13ddbeb30aa777d..42aada7b5eb7e18708f854cdda74d16eacc23415 100644
index e309e8b96cd6605fc812fda2ca3c7ece07824e0c..5472056b3731569737df69b62fa7c75c4ffe18a8 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -789,6 +789,9 @@ void RenderWidgetHostImpl::WasHidden() {
@ -20,7 +20,7 @@ index 35a8d11c3a929cb9a026eebbb13ddbeb30aa777d..42aada7b5eb7e18708f854cdda74d16e
blink::mojom::PointerLockResult::kWrongDocument);
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index ad10b3662636ea51bff23e1f07c806b57c0fc553..a2647c5f9f9f51d54dcde66b3d61f24564f86213 100644
index 4ce389437e583f3b0beaac78b4935808ee54c98e..e39e793bc2673d438cdf01aa909d72732aa32ae2 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -1017,6 +1017,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

4
patches/chromium/feat_configure_launch_options_for_service_process.patch
View file

@ -347,7 +347,7 @@ index 9791ae2f761043b9eecd9064a6fd39a6e2339af4..c1809298c830b814f886859c2626d6bc
// launch failed.
enum class LaunchState {
diff --git a/content/browser/utility_sandbox_delegate.cc b/content/browser/utility_sandbox_delegate.cc
index 98f758cc283f45ffa0218cb584f351b2c0db051c..0ed2ab4a22b42d2600bfafbf7ce350152292a1c8 100644
index 816e834d4a58b79c3b8026ea8b960cbfe75eb319..f0c4a59941d9898006ad31248d6bf1472cb0eede 100644
--- a/content/browser/utility_sandbox_delegate.cc
+++ b/content/browser/utility_sandbox_delegate.cc
@@ -34,17 +34,19 @@ UtilitySandboxedProcessLauncherDelegate::
@ -705,7 +705,7 @@ index 4b2ea0e2680c552b853fcbe4f5e4765a908f8915..6e8af760d986911ed6030b24244e9b21
#if BUILDFLAG(IS_MAC)
// Whether or not to disclaim TCC responsibility for the process, defaults to
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index 30d2877297ec2e65fba9d4ba110c0f4e2c921be5..bbb68ee5de54b54ba4859909cdec9ff692f27289 100644
index 00525a5e5146f3789f5ed4bfe4a1cf36b174a00f..55d3c96e00b76e50d5fe8a1695829d3c9db11fbf 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -672,11 +672,9 @@ base::win::ScopedHandle CreateUnsandboxedJob() {

2
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View file

@ -90,7 +90,7 @@ index 8af69cac78b7488d28f1f05ccb174793fe5148cd..9f74e511c263d147b5fbe81fe100d217
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 055c6ee45f7ca482f1a8292c7fb904d17d238651..d39acbec0b2dd12191e3bc9c18f412310dd1d8a0 100644
index 4ba0b6669f76c9b2725e6665f3a8463e02327cc3..ad5e62fe4184b308148c12c7f47838fd232575b6 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -172,6 +172,8 @@ viz_component("service") {

10
patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
View file

@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
or support it enough to fix the crash.
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
index 59ca49518ec59bc59a735196cf2ae379889019bc..9df9c8925f24ffd5cfe2bcebf5e23c6f926bb9fd 100644
index 2e621b9a66b0443ad961d32a6bed47e1128035a8..5e7c0e238bfe6eb55a2e795681529679a35b8d03 100644
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
@@ -1010,7 +1010,15 @@ export class PdfViewerElement extends PdfViewerBaseElement {
@@ -1012,7 +1012,15 @@ export class PdfViewerElement extends PdfViewerBaseElement {
dataArray = [result.dataToSave];
}
@ -32,7 +32,7 @@ index 59ca49518ec59bc59a735196cf2ae379889019bc..9df9c8925f24ffd5cfe2bcebf5e23c6f
const fileName = this.attachments_[index].name;
chrome.fileSystem.chooseEntry(
{type: 'saveFile', suggestedName: fileName},
@@ -1032,6 +1040,7 @@ export class PdfViewerElement extends PdfViewerBaseElement {
@@ -1034,6 +1042,7 @@ export class PdfViewerElement extends PdfViewerBaseElement {
// </if>
});
});
@ -40,7 +40,7 @@ index 59ca49518ec59bc59a735196cf2ae379889019bc..9df9c8925f24ffd5cfe2bcebf5e23c6f
}
/**
@@ -1160,7 +1169,15 @@ export class PdfViewerElement extends PdfViewerBaseElement {
@@ -1162,7 +1171,15 @@ export class PdfViewerElement extends PdfViewerBaseElement {
}
// Create blob before callback to avoid race condition.
@ -56,7 +56,7 @@ index 59ca49518ec59bc59a735196cf2ae379889019bc..9df9c8925f24ffd5cfe2bcebf5e23c6f
chrome.fileSystem.chooseEntry(
{
type: 'saveFile',
@@ -1189,6 +1206,7 @@ export class PdfViewerElement extends PdfViewerBaseElement {
@@ -1191,6 +1208,7 @@ export class PdfViewerElement extends PdfViewerBaseElement {
// </if>
});
});

4
patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
View file

@ -46,10 +46,10 @@ index 91226bd6e383636ecebdac93b151e107b3f943d9..7fe79f49484b50d2ae9a8d5d0ba9749c
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (IsShortcutHandlingSuspended())
diff --git a/chrome/browser/extensions/global_shortcut_listener.h b/chrome/browser/extensions/global_shortcut_listener.h
index f96af14cb915c8ab92b314ac15b6dffcdd6ec607..2556abe433493251ebd48d4aeddaa6d4f553208f 100644
index 06e65da05a218a8ecc641bbd749ace2b0832ce72..370dfdc9579a9e6b3a6bdc6f4526650a32f53b55 100644
--- a/chrome/browser/extensions/global_shortcut_listener.h
+++ b/chrome/browser/extensions/global_shortcut_listener.h
@@ -33,6 +33,8 @@ class GlobalShortcutListener {
@@ -34,6 +34,8 @@ class GlobalShortcutListener {
static GlobalShortcutListener* GetInstance();

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.
// It will be nullptr if no such view exists. Note that the active view
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 80b1df58edeac63e52758d5f7da87687765c7bf7..18410cd178e80967daa0969ec8b641feb9624c9a 100644
index 356fcf21258dbdc8db38611a47fd920552d6851a..7524e102076144998408a673412e824494c45562 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -9345,7 +9345,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -9223,7 +9223,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =

2
patches/chromium/fix_restore_original_resize_performance_on_macos.patch
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
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 34796157de1c24dc03ed9fb4c3123cea7d57a570..87e5335d19b69677e523a37dfa8d1390fb9ab2fe 100644
index 23fba344bb82ca317db3141ac5def321928bfb4c..89cba17fc2cd46da12cb394b7b728276ffe7ff08 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -2043,9 +2043,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {

2
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -216,7 +216,7 @@ index a9a98852fb0e821fb137edfe840f5a4fe1da4550..619863de9103204a024ec61335fe591a
mojom::blink::WantResultOption::kWantResult, wait_for_promise);
}
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index f4514283a35fc528b916fae37c08ca4396de4821..47d72cff044db0382b4c57102076d01a81cb6475 100644
index 9622c7de8d00e4a68502a09433ede099d5768eba..fe2622ab079105373ade745b2fc96f3275d60d7b 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1098,14 +1098,15 @@ void WebLocalFrameImpl::RequestExecuteScript(

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.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 11967d7c7881aca5cf29edff8db04303a0e66fe4..704488c8d1acb82255bf20d22e9342d9bb57ee3f 100644
index f53b59ece0ebe8587dfd64f4e726833e301e2d92..34867e20ef280eeabedec9a4cb2324e147a78732 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -4491,6 +4491,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -4523,6 +4523,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}

6
patches/chromium/gin_enable_disable_v8_platform.patch
View file

@ -38,10 +38,10 @@ index 7053a5619c6ff6bced75572d7a3336f532b8bb81..89bbc161b99846c1f9e9585e98dd9056
// Returns whether `Initialize` has already been invoked in the process.
// Initialization is a one-way operation (i.e., this method cannot return
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index b1237e4ee88e1c339b80a98acb64baa07b2ae5be..e306ccd3a19b0cba92ed902c179c920f0e4d1faa 100644
index 0894e32248a2faa77d1c1eadf698813e41757377..8e806321258f010d6f084e65b791d725735fb951 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -482,7 +482,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
@@ -550,7 +550,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
// static
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
const std::string js_command_line_flags,
@ -51,7 +51,7 @@ index b1237e4ee88e1c339b80a98acb64baa07b2ae5be..e306ccd3a19b0cba92ed902c179c920f
static bool v8_is_initialized = false;
if (v8_is_initialized)
return;
@@ -492,7 +493,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -560,7 +561,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
// See https://crbug.com/v8/11043
SetFlags(mode, js_command_line_flags);

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

@ -35,10 +35,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 4c7805e58150b1ce61bec0ba116df22298a3e8b4..743d70810423422eba31f7977a6cb5f90d7bc681 100644
index 373e250254e7f7dc9c2d40549549b1b8751d8fe0..68ace763b9040277e0a5306a03a7fc4736210bc5 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1039,6 +1039,7 @@ component("base") {
@@ -1036,6 +1036,7 @@ component("base") {
"//build:ios_buildflags",
"//build/config/compiler:compiler_buildflags",
"//third_party/modp_b64",
@ -198,10 +198,10 @@ index e7a65e97b51d93bff864889813317fb7c6ffc846..bb1fc0c99164ae4bdaaaa78e87c30e88
using crypto::AppleKeychain;
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
index b7a2dede5c5e9a797d10627b7d804064bf13b3f4..df0a36405396372aad2affe602e41b5923b80322 100644
index 1458e7d8edcf2fe17b0ab09b8552bdd817b700f9..f5ebc83573ef3fe7e50910cb8ff1ae33fbb7c35b 100644
--- a/components/remote_cocoa/app_shim/BUILD.gn
+++ b/components/remote_cocoa/app_shim/BUILD.gn
@@ -87,6 +87,7 @@ component("app_shim") {
@@ -86,6 +86,7 @@ component("app_shim") {
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/strings:ui_strings_grit",
@ -250,7 +250,7 @@ index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..8b5f4cae3123ac5480ad73f0c873fca0
} // namespace
diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
index 53553a707a646012c50b0bd2d0ffd8d4dbd67e11..e306511e15fd2a522748c3f90c78aab8dde4238e 100644
index f9dae777fd2d6ba4f9fe647e6507dea4005d7e25..acef8dfa59981ef58bdfa14108eedfebfdc60334 100644
--- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
+++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
@@ -8,7 +8,9 @@
@ -263,7 +263,7 @@ index 53553a707a646012c50b0bd2d0ffd8d4dbd67e11..e306511e15fd2a522748c3f90c78aab8
@interface NSWindow (PrivateBrowserNativeWidgetAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end
@@ -65,10 +67,13 @@ - (BOOL)_shouldCenterTrafficLights {
@@ -100,10 +102,13 @@ - (void)maybeShowTrafficLights {
@end
@ -277,7 +277,7 @@ index 53553a707a646012c50b0bd2d0ffd8d4dbd67e11..e306511e15fd2a522748c3f90c78aab8
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
if ([BrowserWindowFrame class])
@@ -115,6 +120,8 @@ - (BOOL)_usesCustomDrawing {
@@ -150,6 +155,8 @@ - (BOOL)_usesCustomDrawing {
return NO;
}
@ -286,6 +286,17 @@ index 53553a707a646012c50b0bd2d0ffd8d4dbd67e11..e306511e15fd2a522748c3f90c78aab8
// Handle "Move focus to the window toolbar" configured in System Preferences ->
// Keyboard -> Shortcuts -> Keyboard. Usually Ctrl+F5. The argument (|unknown|)
// tends to just be nil.
@@ -160,8 +167,8 @@ - (void)_handleFocusToolbarHotKey:(id)unknown {
}
- (void)setAlwaysShowTrafficLights:(BOOL)alwaysShow {
- [base::apple::ObjCCastStrict<BrowserWindowFrame>(self.contentView.superview)
- setAlwaysShowTrafficLights:alwaysShow];
+ // [base::apple::ObjCCastStrict<BrowserWindowFrame>(self.contentView.superview)
+ // setAlwaysShowTrafficLights:alwaysShow];
}
@end
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm
index 3a815ebf505bd95fa7f6b61ba433d98fbfe20225..149de0175c2ec0e41e3ba40caad7019ca87386d6 100644
--- a/components/remote_cocoa/app_shim/native_widget_mac_frameless_nswindow.mm
@ -350,7 +361,7 @@ index 945b01f2132547fa0f6a97ee4895994c500d1410..864f93f7c4159abc63e1535195fbf9d1
// The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
// can only be accomplished by overriding methods.
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
index 2aa2bd8d68c08359461254875f02fc37f8693058..5d5584d22ead9730876fae2fc3971982ae7f61bb 100644
index 4f875587289f19b06041c5e8a7f76ab9cba169c9..952febab99656f59efee8c0d267d8f76f9943197 100644
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
@@ -26,6 +26,7 @@
@ -398,7 +409,7 @@ index 2aa2bd8d68c08359461254875f02fc37f8693058..5d5584d22ead9730876fae2fc3971982
@implementation NativeWidgetMacNSWindow {
@private
CommandDispatcher* __strong _commandDispatcher;
@@ -374,6 +383,8 @@ - (NSAccessibilityRole)accessibilityRole {
@@ -380,6 +389,8 @@ - (NSAccessibilityRole)accessibilityRole {
// NSWindow overrides.
@ -407,7 +418,7 @@ index 2aa2bd8d68c08359461254875f02fc37f8693058..5d5584d22ead9730876fae2fc3971982
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
if (windowStyle & NSWindowStyleMaskTitled) {
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
@@ -385,6 +396,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
@@ -391,6 +402,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
return [super frameViewClassForStyleMask:windowStyle];
}
@ -442,10 +453,10 @@ index f71ea08f64ab5cd36f6bd1e2d3d2908d4de80ba6..4b3450b3bd44a35964bd935453861101
// Beware: This view was briefly removed (in favor of a bare CALayer) in
// https://crrev.com/c/1236675. The ordering of unassociated layers relative
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 83aa52af49bf5cb26de1e3a32cafc1fc50eff191..055c6ee45f7ca482f1a8292c7fb904d17d238651 100644
index d5fbeedbbafcc5f498229ff465eba300bed69b29..4ba0b6669f76c9b2725e6665f3a8463e02327cc3 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -372,6 +372,7 @@ viz_component("service") {
@@ -374,6 +374,7 @@ viz_component("service") {
"frame_sinks/external_begin_frame_source_mac.h",
]
}
@ -453,7 +464,7 @@ index 83aa52af49bf5cb26de1e3a32cafc1fc50eff191..055c6ee45f7ca482f1a8292c7fb904d1
}
if (is_android || use_ozone) {
@@ -646,6 +647,7 @@ viz_source_set("unit_tests") {
@@ -648,6 +649,7 @@ viz_source_set("unit_tests") {
"display_embedder/software_output_device_mac_unittest.mm",
]
frameworks = [ "IOSurface.framework" ]
@ -547,7 +558,7 @@ index 13c3fe06c417a2565e6af4552930a56c44a01fb3..ef67191f5d010451cde2b084d6165c7d
return kAttributes;
}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index e2096b8a8ee94c3d4354a4c17d65b55643e520c0..c569ecb529a85bdd350c2e8b52f95bd40658d9e2 100644
index 70e143feb497711d12857333d48ce2ac4325bcd9..3ec50c52f1d824c544c77515213f7a50c9870a11 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -320,6 +320,7 @@ source_set("browser") {
@ -593,7 +604,7 @@ index 2285564db47ef15eb9a83affd1e481b5671c3940..cf5e79a5540d8208c34579d7e8b5a571
// Used to force the NSApplication's focused accessibility element to be the
// content::BrowserAccessibilityCocoa accessibility tree when the NSView for
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 4a6a4da32e4effbad8bff85220edf0b34685f274..e3c4075e4aa4a2bf854f5308f25775bd10ce32dc 100644
index c6512e8ce79f757a77a0d952e8d82d12d8be449c..69eb2ad17a15a17ca274a3a3128de9b841061a95 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -48,6 +48,7 @@
@ -615,7 +626,7 @@ index 4a6a4da32e4effbad8bff85220edf0b34685f274..e3c4075e4aa4a2bf854f5308f25775bd
// Reset `ns_view_` before resetting `remote_ns_view_` to avoid dangling
// pointers. `ns_view_` gets reinitialized later in this method.
@@ -1639,8 +1642,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1636,8 +1639,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
gfx::NativeViewAccessible
RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -626,7 +637,7 @@ index 4a6a4da32e4effbad8bff85220edf0b34685f274..e3c4075e4aa4a2bf854f5308f25775bd
return [GetInProcessNSView() window];
}
@@ -1689,9 +1694,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1686,9 +1691,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
}
void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -638,7 +649,7 @@ index 4a6a4da32e4effbad8bff85220edf0b34685f274..e3c4075e4aa4a2bf854f5308f25775bd
}
bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
@@ -2215,20 +2222,26 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -2212,20 +2219,26 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
void RenderWidgetHostViewMac::GetRenderWidgetAccessibilityToken(
GetRenderWidgetAccessibilityTokenCallback callback) {
base::ProcessId pid = getpid();

6
patches/chromium/notification_provenance.patch
View file

@ -133,10 +133,10 @@ index 05d3a12dd84c7005d46cc73b312f97ef418d96f5..4765de982802541b3efc7211d106acc7
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 7fc25caf3b3f871205a327ff3c8f95829cc7c3db..3c5a891cc1d59e6f7d0aaff00fca39f48fb99567 100644
index 4258d0b491479a0bb44bfb309b40334a5b6116ae..94fa8d7908156753be7e2b61574e70cd1d2cf4ba 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2107,7 +2107,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2108,7 +2108,7 @@ void RenderProcessHostImpl::CreateNotificationService(
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@ -145,7 +145,7 @@ index 7fc25caf3b3f871205a327ff3c8f95829cc7c3db..3c5a891cc1d59e6f7d0aaff00fca39f4
creator_type, std::move(receiver));
break;
}
@@ -2115,7 +2115,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2116,7 +2116,7 @@ void RenderProcessHostImpl::CreateNotificationService(
CHECK(rfh);
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

2
patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
View file

@ -10,7 +10,7 @@ an about:blank check to this area.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 2beea79e54b8fb1aeccafeb28affdd4609dd6851..97c3e3d9b8ba1badbdf7645f2c75193e28ce5ebe 100644
index caf1d967e649845012fb98749918f6f7582bf6ed..705acf5b4b836d69571028997db2a697c194a165 100644
--- a/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(

4
patches/chromium/printing.patch
View file

@ -860,10 +860,10 @@ index 14de029740ffbebe06d309651c1a2c007d9fb96b..e9bf9c5bef2a9235260e7d6c8d26d415
ScriptingThrottler scripting_throttler_;
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index c569ecb529a85bdd350c2e8b52f95bd40658d9e2..6611cc0f6aa5cbbcdc2823ca944fa72ef5578b80 100644
index 3ec50c52f1d824c544c77515213f7a50c9870a11..14b84d7fa67796afb390eccd227ba4311f536ffa 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -3000,8 +3000,9 @@ source_set("browser") {
@@ -3001,8 +3001,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]

14
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about `
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779
diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h
index 84085ac531eb9d0d34dad6390862e05c8af90955..207120ce536cd0a8c5aadda8c57a71c76601f5a7 100644
index 76acfee7bee2bc9ab25fc692a0f2485091a39da5..48cba2fbd4e86956197d7b114dcefc4bc0cd454c 100644
--- a/content/browser/renderer_host/render_widget_host_delegate.h
+++ b/content/browser/renderer_host/render_widget_host_delegate.h
@@ -27,6 +27,7 @@
@ -19,7 +19,7 @@ index 84085ac531eb9d0d34dad6390862e05c8af90955..207120ce536cd0a8c5aadda8c57a71c7
#include "ui/gfx/native_widget_types.h"
namespace blink {
@@ -286,6 +287,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate {
@@ -288,6 +289,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate {
// Returns the associated RenderViewHostDelegateView*, if possible.
virtual RenderViewHostDelegateView* GetDelegateView();
@ -30,7 +30,7 @@ index 84085ac531eb9d0d34dad6390862e05c8af90955..207120ce536cd0a8c5aadda8c57a71c7
// RenderWidgetHost on the primary main frame, and false otherwise.
virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 42aada7b5eb7e18708f854cdda74d16eacc23415..34796157de1c24dc03ed9fb4c3123cea7d57a570 100644
index 5472056b3731569737df69b62fa7c75c4ffe18a8..23fba344bb82ca317db3141ac5def321928bfb4c 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1977,6 +1977,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
@ -44,10 +44,10 @@ index 42aada7b5eb7e18708f854cdda74d16eacc23415..34796157de1c24dc03ed9fb4c3123cea
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1dc6de327d29fe89486ef84c2ccea96bb38136b5..9e79f504a18e943d56ef02d2424403e0acbe157e 100644
index 3d0827092ac2a0c0a1416aa40c69ea4d2bc831ac..fdd19e13832ebd3146a9f8c09109d776081837ef 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5575,6 +5575,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -5481,6 +5481,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -60,10 +60,10 @@ index 1dc6de327d29fe89486ef84c2ccea96bb38136b5..9e79f504a18e943d56ef02d2424403e0
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 188a98ad2587655b0906669b3c0aba6a76bc183c..6bfb2bdb77fd92d9b9cc10864ff458c26b3802dc 100644
index 8f4686ffada75909661e8f0e0bafa87a6c49c721..ac64f566ad667a1a8cb6dd264b1b22d1149a6eb6 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1114,6 +1114,7 @@ class CONTENT_EXPORT WebContentsImpl
@@ -1116,6 +1116,7 @@ class CONTENT_EXPORT WebContentsImpl
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;

6
patches/chromium/refactor_expose_file_system_access_blocklist.patch
View file

@ -8,10 +8,10 @@ it in Electron and prevent drift from Chrome's blocklist. We should look for a w
to upstream this change to Chrome.
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
index 027b494015450002f676303f54874636e4cc4115..a7540f3e625978792bd0bbcb444b54ab25f8b39b 100644
index 65e445220e7afcfa6fbec2c482186923822ad0c5..024fd5e77eb5739c4c83f5f2a9620fe4aa1308bf 100644
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -42,7 +42,6 @@
@@ -43,7 +43,6 @@
#include "chrome/browser/ui/file_system_access/file_system_access_dangerous_file_dialog.h"
#include "chrome/browser/ui/file_system_access/file_system_access_dialogs.h"
#include "chrome/browser/ui/file_system_access/file_system_access_restricted_directory_dialog.h"
@ -19,7 +19,7 @@ index 027b494015450002f676303f54874636e4cc4115..a7540f3e625978792bd0bbcb444b54ab
#include "chrome/grit/generated_resources.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
@@ -234,122 +233,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) {
@@ -235,122 +234,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) {
}
#endif

6
patches/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 9b945eb5382482546c7fe0db130e03858f94e027..6193a1017c888a5b1187f25f858b9af5930063bb 100644
index 3049bfae136860928c25ad9a06fbd82c25084763..751a3087c4a06f9f03373f890b3400621680089d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1588,7 +1588,7 @@ if (is_chrome_branded && !is_android) {
@@ -1589,7 +1589,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index 9b945eb5382482546c7fe0db130e03858f94e027..6193a1017c888a5b1187f25f858b9af5
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1627,6 +1627,12 @@ if (!is_android) {
@@ -1628,6 +1628,12 @@ if (!is_android) {
}
}

4
patches/chromium/support_mixed_sandbox_with_zygote.patch
View file

@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 3c5a891cc1d59e6f7d0aaff00fca39f48fb99567..b5ac9f952697790671d5dbd9c5807fb8dbce5bb3 100644
index 94fa8d7908156753be7e2b61574e70cd1d2cf4ba..976d217de5d271af484e981f4ffd5d30d33d1686 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1752,6 +1752,10 @@ bool RenderProcessHostImpl::Init() {
@@ -1753,6 +1753,10 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
*cmd_line, IsPdf(), IsJitDisabled());

8
patches/chromium/web_contents.patch
View file

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index dd2f2912bd76e43a08dd5149c13a1b49b1565290..cb878dbcb0b22e8ab71a76589742c6e908ac57ad 100644
index 01dfe2627cab05123516aae2fbaa4773432bdbbf..caa0f109c9b7200ba04525c54935108d53712f87 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3744,6 +3744,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3650,6 +3650,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
@ -26,7 +26,7 @@ index dd2f2912bd76e43a08dd5149c13a1b49b1565290..cb878dbcb0b22e8ab71a76589742c6e9
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3754,6 +3761,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3660,6 +3667,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
@ -35,7 +35,7 @@ index dd2f2912bd76e43a08dd5149c13a1b49b1565290..cb878dbcb0b22e8ab71a76589742c6e9
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 531789d666a8db1aecce56a6cfbf9dc188a5dd12..ea15666ba13f20cc56ab18176606481cbd04fae5 100644
index d7bef45db08712c90003d6dafaf93952b608fce4..9d6f1d89819c04a039187412301a8bf8a3717726 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -110,10 +110,13 @@ class BrowserContext;

10
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.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 556086106747673de32486df2e82f98f165a9156..2beea79e54b8fb1aeccafeb28affdd4609dd6851 100644
index 94784b4bc3e212755d1c371e2b6c2f259ea4542e..caf1d967e649845012fb98749918f6f7582bf6ed 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8189,6 +8189,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -8185,6 +8185,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}
@ -37,10 +37,10 @@ index 556086106747673de32486df2e82f98f165a9156..2beea79e54b8fb1aeccafeb28affdd46
if (had_fullscreen_token && !GetView()->HasFocus())
GetView()->Focus();
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index cb878dbcb0b22e8ab71a76589742c6e908ac57ad..80b1df58edeac63e52758d5f7da87687765c7bf7 100644
index caa0f109c9b7200ba04525c54935108d53712f87..356fcf21258dbdc8db38611a47fd920552d6851a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3999,21 +3999,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
@@ -3905,21 +3905,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
const input::NativeWebKeyboardEvent& event) {
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
"WebContentsImpl::PreHandleKeyboardEvent");
@ -78,7 +78,7 @@ index cb878dbcb0b22e8ab71a76589742c6e908ac57ad..80b1df58edeac63e52758d5f7da87687
}
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -4172,7 +4176,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -4078,7 +4082,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame));
DCHECK(requesting_frame->IsActive());

4
patches/devtools_frontend/chore_expose_ui_to_allow_electron_to_set_dock_side.patch
View file

@ -10,10 +10,10 @@ to handle this without patching, but this is fairly clean for now and no longer
patching legacy devtools code.
diff --git a/front_end/entrypoints/main/MainImpl.ts b/front_end/entrypoints/main/MainImpl.ts
index 3a5a863abf8fa966eb7c118d17adbd1217e0f6a6..0441afc49db9e835897844dace9309fde6a328a1 100644
index c67f77bd670d76da9b642cc404a85dfbe9844fd6..6f52d67fb8df36f0aefd32b6061ee84342f97739 100644
--- a/front_end/entrypoints/main/MainImpl.ts
+++ b/front_end/entrypoints/main/MainImpl.ts
@@ -763,6 +763,8 @@ export class MainImpl {
@@ -757,6 +757,8 @@ export class MainImpl {
globalThis.Main = globalThis.Main || {};
// @ts-ignore Exported for Tests.js
globalThis.Main.Main = MainImpl;

4
shell/browser/extensions/api/tabs/tabs_api.cc
View file

@ -578,9 +578,7 @@ base::expected<GURL, std::string> PrepareURLForNavigation(
// Don't let the extension navigate directly to file scheme pages, unless
// they have file access.
if (url.SchemeIsFile() &&
!AllowFileAccess(extension->id(), browser_context) &&
base::FeatureList::IsEnabled(
extensions_features::kRestrictFileURLNavigation)) {
!AllowFileAccess(extension->id(), browser_context)) {
const char kFileUrlsNotAllowedInExtensionNavigations[] =
"Cannot navigate to a file URL without local file access.";
return base::unexpected(kFileUrlsNotAllowedInExtensionNavigations);