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

chore: bump chromium to 136.0.7058.1 (main) (#45928)

Browse source 
* chore: bump chromium in DEPS to 136.0.7056.0

* chore: update mas_avoid_private_macos_api_usage.patch.patch

no manual changes; patch applied with fuzz

* chore: update fix_adapt_exclusive_access_for_electron_needs.patch

patch applied manually due to context shear

6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble | 6319958

* chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch

no manual changes; patch applied with fuzz

6311876: Expose captured surface resolution for MacOS | 6311876

* chore: e patches all

* 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble | 6319958

* 6326673: views: Delete the single-parameter Widget::InitParams constructor. | 6326673

* 6331102

* 6331102: [A11yPerformance] Rename AXMode::kScreenReader to kExtendedProperties | 6331102

Sync with shell/browser/ui/webui/accessibility_ui.cc to
upstream chrome/browser/accessibility/accessibility_ui.cc
changes in 4af8657

* chore: bump Chromium 136.0.7058.1 (#45933)

chore: bump chromium in DEPS to 136.0.7058.1

---------

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] 2025-03-10 00:30:34 -05:00 • committed by GitHub
parent 9b2e7db469
commit b0c11371e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 115 additions and 113 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 = { vars = {
'chromium_version': 'chromium_version':
'136.0.7054.0', '136.0.7058.1',
'node_version': 'node_version':
'v22.14.0', 'v22.14.0',
'nan_version': 'nan_version':

6
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -23,10 +23,10 @@ index 44da0544b778d6ff4c14b6f4e8463cb8260d2f0d..8ae8939af4141a684b7a6d50a43e1abb
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 7a31bbcf2c50c4b74d78dbdb1f6d810042305ce7..a2d86c12916581509240527b08c7bb7ad6f06283 100644 index 3afbd7c4e88d97f1a5c744e82eba2da19cd9e53f..143c42b98965c879557213670a9fbbe460faec5b 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
@@ -4786,6 +4786,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context, @@ -4794,6 +4794,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id); observer.DidCreateScriptContext(context, world_id);
} }
@ -40,7 +40,7 @@ index 7a31bbcf2c50c4b74d78dbdb1f6d810042305ce7..a2d86c12916581509240527b08c7bb7a
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 0f5dcc4454b7b607a7c8e21511a6de8ac49a69b4..97395700346888539e14290a4019fa48b14b3d6d 100644 index bf073c9180d47243f09fdd052a43dfe7e34aa4aa..d1642b675e474568c302553a288253b639ed1efd 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
@@ -653,6 +653,8 @@ class CONTENT_EXPORT RenderFrameImpl @@ -653,6 +653,8 @@ class CONTENT_EXPORT RenderFrameImpl

2
patches/chromium/adjust_accessibility_ui_for_electron.patch
View file

@ -10,7 +10,7 @@ usage of BrowserList and Browser as we subclass related methods and use our
WindowList. WindowList.
diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
index ff25e6eb48deb339ab92152eb09ad856068fd589..4a1f81429f0857e129e31103b026079de13fd826 100644 index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb491ec14b2 100644
--- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc --- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
+++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc +++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@

4
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
View file

@ -39,7 +39,7 @@ index 6c1e46e58d975137eee6c0fd7b01d2ae970a2e10..5ca29616369e76e298eb03188e18ca54
return is_active(); 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 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 5fb8a3dc69dc5fc5bfa08e01d8f03707a23c9274..41774b60b8cb7e0a22cedc597dc07ad15c96988c 100644 index 56e52f079d1ad7c7a22764b976f0c8b2cc48dff2..1231fe522ad103e94d3c30ad7d5e5d23df9b3554 100644
--- a/content/browser/renderer_host/render_view_host_impl.h --- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl @@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@ -51,7 +51,7 @@ index 5fb8a3dc69dc5fc5bfa08e01d8f03707a23c9274..41774b60b8cb7e0a22cedc597dc07ad1
void SendRendererPreferencesToRenderer( void SendRendererPreferencesToRenderer(
const blink::RendererPreferences& preferences); const blink::RendererPreferences& preferences);
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 92085aca6bd0c95a73b98e4173c0128d596b77f4..9503beefcbcfe7d99674582ece10a7e551fae96d 100644 index 3cd53be3dbb0f63b632f0d7bcccfdc1b2e02ccdf..fec1cdc083d1cb365188a7635a6c062b275d1f64 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -579,8 +579,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) { @@ -579,8 +579,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f
"//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 389f11154cef421cd1217276c0c45c3bf29c4df0..ab7dc7768d4fa51494e802ecbe93911cd7193498 100644 index 902ad1f49369279a69cafe543cd94eaf0a1374c1..37f479b7df3f9fcb1fa78b27f581e1c514b0b60c 100644
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4566,7 +4566,7 @@ static_library("browser") { @@ -4565,7 +4565,7 @@ static_library("browser") {
[ "//chrome/browser/ui/webui/signin:profile_impl" ] [ "//chrome/browser/ui/webui/signin:profile_impl" ]
} }
@ -46,10 +46,10 @@ index 389f11154cef421cd1217276c0c45c3bf29c4df0..ab7dc7768d4fa51494e802ecbe93911c
# 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 465ed84c60e25d57de7f3da6d70947cf0e183830..6c96b4b7f5796652539725320dc60edfd8de4ac9 100644 index 250c53fec9bab3e88b9735ec9c4a3fcf99e80213..9e5cb562220ff6a219827fceb222a0000dd633f7 100644
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -7023,9 +7023,12 @@ test("unit_tests") { @@ -7024,9 +7024,12 @@ test("unit_tests") {
"//chrome/notification_helper", "//chrome/notification_helper",
] ]
@ -63,7 +63,7 @@ index 465ed84c60e25d57de7f3da6d70947cf0e183830..6c96b4b7f5796652539725320dc60edf
"//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",
@@ -7988,6 +7991,10 @@ test("unit_tests") { @@ -7989,6 +7992,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 465ed84c60e25d57de7f3da6d70947cf0e183830..6c96b4b7f5796652539725320dc60edf
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",
@@ -8043,7 +8050,6 @@ test("unit_tests") { @@ -8044,7 +8051,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",

8
patches/chromium/can_create_window.patch
View file

@ -9,7 +9,7 @@ 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 3eb788921d8acaafca69dd48435c4cc0b2147c4b..ee3ea03f0c60066330bc5c9f02e4c2beeafd136b 100644 index d44936988588eb5415c2a3300d367c769c7edcbb..d1c86dcadcbd134ce4585e02c9e2d63d6c9ca3f7 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
@@ -9627,6 +9627,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -9627,6 +9627,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@ -21,7 +21,7 @@ index 3eb788921d8acaafca69dd48435c4cc0b2147c4b..ee3ea03f0c60066330bc5c9f02e4c2be
&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 3d9cc010d0e80e9551cf1d07e535df7d1fd21a87..d204a45939c7318697c5eb0d6efe7bc7fe94b4d1 100644 index 33ca575e4bbaf1f2aca94d0ff88424079da94d03..690a8feaee2ecc0d099cbc729ca3cd3b0281d53e 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
@@ -5061,6 +5061,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -5061,6 +5061,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@ -148,10 +148,10 @@ index ac2e7cdceb13ce07966a908fab3ff8feff969484..96cb58b1a88499cf8f78d748dc5a1cc1
// 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 f4f4ba811c0a4b682716d0d75da4a7ef8900f6d3..7a31bbcf2c50c4b74d78dbdb1f6d810042305ce7 100644 index 602bea4189f0d23c19cbc7afd56583927cbb7e0c..3afbd7c4e88d97f1a5c744e82eba2da19cd9e53f 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
@@ -6907,6 +6907,10 @@ WebView* RenderFrameImpl::CreateNewWindow( @@ -6916,6 +6916,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 6540f14c2c94f78282b298d84e65f4680844eb78..f4bebb35fe53e4fd68bd8519a0bfab8414b64bda 100644 index e806b0d2e59764b6cac2872659de1a10479acdc0..3a991c6ace931ec17ea36737e24146b7836fafe4 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
@@ -4980,7 +4980,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4980,7 +4980,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

8
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -80,10 +80,10 @@ index 4fd8dff1089cd6afa6a66dc185734d7671657281..0a1f4268ea771a3d5d4a2668928c6e5d
content::WebContents* source, content::WebContents* source,
const content::OpenURLParams& params, const content::OpenURLParams& params,
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c841bd4636b447ad7400c831923f36890799a8f7..37dffc9e3dd5e577c83fce75f10a556ce924cfe3 100644 index 8232c0081baaeb3df9f2f6224f8fe31a2dcb1d5b..081c01bc00dfdef66c23a9ef640ed159f4f7557b 100644
--- a/chrome/browser/ui/browser.cc --- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -2249,12 +2249,11 @@ bool Browser::IsWebContentsCreationOverridden( @@ -2264,12 +2264,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance, content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type, content::mojom::WindowContainerType window_container_type,
const GURL& opener_url, const GURL& opener_url,
@ -99,7 +99,7 @@ index c841bd4636b447ad7400c831923f36890799a8f7..37dffc9e3dd5e577c83fce75f10a556c
WebContents* Browser::CreateCustomWebContents( WebContents* Browser::CreateCustomWebContents(
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index c34df3902e663d962553a9fd1731ad2c603393ca..897045bef1c68e5638b9b570d066066764fcae8a 100644 index 7a61c64db93db7f3b31b8d39897257a6315383c2..7db684020fbaf7061ed61a8b1cefba8c757f2fe5 100644
--- a/chrome/browser/ui/browser.h --- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h
@@ -981,8 +981,7 @@ class Browser : public TabStripModelObserver, @@ -981,8 +981,7 @@ class Browser : public TabStripModelObserver,
@ -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 2fb39006ca697d3b16507e3000bff2768b334092..6992093d069f0d9a50eab29cdd36bffba586eca9 100644 index a39fc6900b8c4dfc1467a9498fdfb68eb6b27bd0..4e15fbef46935b7f3ac94f04eecba6c6dc24e3d0 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
@@ -4943,8 +4943,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4943,8 +4943,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

2
patches/chromium/disable_hidden.patch
View file

@ -35,7 +35,7 @@ index 99fe44aab8599bffe256e4683ec36441c06925b8..72c5afe5d028c77acb76757698c15a01
// |routing_id| must not be MSG_ROUTING_NONE. // |routing_id| must not be MSG_ROUTING_NONE.
// If this object outlives |delegate|, DetachDelegate() must be called when // If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 1d08f25b91496dbafc3a164e7fb3e66d1a48557b..92085aca6bd0c95a73b98e4173c0128d596b77f4 100644 index be9fe00b88a381f8ab0d121e9d112fc981b414fb..3cd53be3dbb0f63b632f0d7bcccfdc1b2e02ccdf 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -643,7 +643,7 @@ void RenderWidgetHostViewAura::HideImpl() { @@ -643,7 +643,7 @@ void RenderWidgetHostViewAura::HideImpl() {

16
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net } // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index dd7a74cd1faa4486cb5be6598a5b8e36c94aaed2..9e171f4d13223caf32d85a51be850ccf86e72d0a 100644 index 771fee7092bb25e4f7546941a04647d060e966c2..356d7e8fd5e8a82a8d506d1172844706bc76c99f 100644
--- a/services/network/network_context.cc --- a/services/network/network_context.cc
+++ b/services/network/network_context.cc +++ b/services/network/network_context.cc
@@ -1806,6 +1806,13 @@ void NetworkContext::SetNetworkConditions( @@ -1814,6 +1814,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions)); std::move(network_conditions));
} }
@ -51,10 +51,10 @@ index dd7a74cd1faa4486cb5be6598a5b8e36c94aaed2..9e171f4d13223caf32d85a51be850ccf
// This may only be called on NetworkContexts created with the constructor // This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext(). // that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h diff --git a/services/network/network_context.h b/services/network/network_context.h
index fe04f634b32e503f6e93ae6f20c8c7f7c85d02be..990df479da79b513cf8797aa2fcacba10c4fbbd9 100644 index 930e0bd987c48d111b2c8d71147c09e4418bda6c..9373a53c5cac879c689fcea77f1dbbb32cf35b9e 100644
--- a/services/network/network_context.h --- a/services/network/network_context.h
+++ b/services/network/network_context.h +++ b/services/network/network_context.h
@@ -317,6 +317,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext @@ -323,6 +323,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override; void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override; mojom::NetworkConditionsPtr conditions) override;
@ -63,10 +63,10 @@ index fe04f634b32e503f6e93ae6f20c8c7f7c85d02be..990df479da79b513cf8797aa2fcacba1
void SetEnableReferrers(bool enable_referrers) override; void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CT_SUPPORTED) #if BUILDFLAG(IS_CT_SUPPORTED)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 48e3d3b3587e15d13e9048c9f61d9dcdd8c7acee..6e4f8939f4b435643aefa23e847ceb65c6d6dc42 100644 index 773049b72e7784d396bb9cd1ebd29c3a523e7454..eccbcaf01b06d3c7613556d8f7617502c823e074 100644
--- a/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom
@@ -1256,6 +1256,9 @@ interface NetworkContext { @@ -1261,6 +1261,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id, SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
NetworkConditions? conditions); NetworkConditions? conditions);
@ -77,10 +77,10 @@ index 48e3d3b3587e15d13e9048c9f61d9dcdd8c7acee..6e4f8939f4b435643aefa23e847ceb65
SetAcceptLanguage(string new_accept_language); SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 97e8f9f145cecad9b0cd8b43a2de4af29cec7778..b9539a731d2252c8301d51ccb7a1bd7b1a23ca53 100644 index da8551db16849cf82a6e3a7eaeb451cae0707f2d..6e20b8dd4f134ea7a8808223cd59064d89f5ce09 100644
--- a/services/network/test/test_network_context.h --- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h +++ b/services/network/test/test_network_context.h
@@ -156,6 +156,7 @@ class TestNetworkContext : public mojom::NetworkContext { @@ -158,6 +158,7 @@ class TestNetworkContext : public mojom::NetworkContext {
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {} void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override {} mojom::NetworkConditionsPtr conditions) override {}

2
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
View file

@ -62,7 +62,7 @@ index 2e657f24bb625c7a7af14686553aebdc06ad8eda..6f2384338ac4a48a78bc8aac8b4bb9d3
SEQUENCE_CHECKER(sequence_checker_); SEQUENCE_CHECKER(sequence_checker_);
}; };
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 2b2a12cd9d1ac17a245f049cf0775b46c0596531..350586d35b29fb8d772ea70615768d0e62dc5474 100644 index b5ed5d33890bf4f98237c92bbe642063d27d0092..82c1705ae0dbc7ac33eb90e7978d48c7de7f1c8f 100644
--- a/ui/native_theme/native_theme_win.cc --- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc
@@ -688,6 +688,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const { @@ -688,6 +688,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {

30
patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
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 e59ed011a70358a4ff61342e4db3e0ce4cad8ab0..e3fa18fbade4c11f5317705bc89a1e2456c924bc 100644 index 4ec4c895423151d2c907d97de1461cbde8c8a639..0e59797833b81c07299b8c342f591e192183c6f1 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(
@ -33,7 +33,7 @@ index e59ed011a70358a4ff61342e4db3e0ce4cad8ab0..e3fa18fbade4c11f5317705bc89a1e24
void IOSurfaceCaptureDeviceBase::StopAndDeAllocate() { void IOSurfaceCaptureDeviceBase::StopAndDeAllocate() {
diff --git a/content/browser/media/capture/io_surface_capture_device_base_mac.h b/content/browser/media/capture/io_surface_capture_device_base_mac.h diff --git a/content/browser/media/capture/io_surface_capture_device_base_mac.h b/content/browser/media/capture/io_surface_capture_device_base_mac.h
index 8ac12480f663a74dfbdcf7128a582a81b4474d25..db6802a2603e1d3c3039e49737438124bf2ee1f1 100644 index e2771b7b281274cdcb601a5bc78a948ad592087b..48d116823a28213e50775f378e6ce04ce3af5072 100644
--- a/content/browser/media/capture/io_surface_capture_device_base_mac.h --- a/content/browser/media/capture/io_surface_capture_device_base_mac.h
+++ b/content/browser/media/capture/io_surface_capture_device_base_mac.h +++ b/content/browser/media/capture/io_surface_capture_device_base_mac.h
@@ -25,7 +25,7 @@ class CONTENT_EXPORT IOSurfaceCaptureDeviceBase @@ -25,7 +25,7 @@ class CONTENT_EXPORT IOSurfaceCaptureDeviceBase
@ -46,11 +46,11 @@ index 8ac12480f663a74dfbdcf7128a582a81b4474d25..db6802a2603e1d3c3039e49737438124
// OnStop is called by StopAndDeAllocate. // OnStop is called by StopAndDeAllocate.
virtual void OnStop() = 0; virtual void OnStop() = 0;
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378719b14fe 100644 index 7e17594c30ac3cf8cb484b53563b03fc75bd2e0b..0e4a68f2fd8179640f877cb258b4049610fd49da 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm --- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm +++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -26,6 +26,61 @@ @@ -27,6 +27,61 @@
std::optional<gfx::Rect>, std::optional<float>,
bool)>; bool)>;
using ErrorCallback = base::RepeatingClosure; using ErrorCallback = base::RepeatingClosure;
+using CancelCallback = base::RepeatingClosure; +using CancelCallback = base::RepeatingClosure;
@ -111,7 +111,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
namespace { namespace {
API_AVAILABLE(macos(12.3)) API_AVAILABLE(macos(12.3))
@@ -120,18 +175,22 @@ @interface ScreenCaptureKitDeviceHelper @@ -123,18 +178,22 @@ @interface ScreenCaptureKitDeviceHelper
: NSObject <SCStreamDelegate, SCStreamOutput> : NSObject <SCStreamDelegate, SCStreamOutput>
- (instancetype)initWithSampleCallback:(SampleCallback)sampleCallback - (instancetype)initWithSampleCallback:(SampleCallback)sampleCallback
@ -134,7 +134,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
_errorCallback = errorCallback; _errorCallback = errorCallback;
} }
return self; return self;
@@ -207,29 +266,53 @@ + (SCStreamConfiguration*)streamConfigurationWithFrameSize:(gfx::Size)frameSize @@ -211,29 +270,53 @@ + (SCStreamConfiguration*)streamConfigurationWithFrameSize:(gfx::Size)frameSize
class API_AVAILABLE(macos(12.3)) ScreenCaptureKitDeviceMac class API_AVAILABLE(macos(12.3)) ScreenCaptureKitDeviceMac
: public IOSurfaceCaptureDeviceBase, : public IOSurfaceCaptureDeviceBase,
@ -192,7 +192,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
void OnShareableContentCreated(SCShareableContent* content) { void OnShareableContentCreated(SCShareableContent* content) {
DCHECK(device_task_runner_->RunsTasksInCurrentSequence()); DCHECK(device_task_runner_->RunsTasksInCurrentSequence());
@@ -297,7 +380,7 @@ void CreateStream(SCContentFilter* filter) { @@ -301,7 +384,7 @@ void CreateStream(SCContentFilter* filter) {
return; return;
} }
@ -201,7 +201,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
// Update the content size. This step is neccessary when used together // Update the content size. This step is neccessary when used together
// with SCContentSharingPicker. If the Chrome picker is used, it will // with SCContentSharingPicker. If the Chrome picker is used, it will
// change to retina resolution if applicable. // change to retina resolution if applicable.
@@ -306,6 +389,9 @@ void CreateStream(SCContentFilter* filter) { @@ -310,6 +393,9 @@ void CreateStream(SCContentFilter* filter) {
filter.contentRect.size.height * filter.pointPixelScale); filter.contentRect.size.height * filter.pointPixelScale);
} }
@ -211,7 +211,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
gfx::RectF dest_rect_in_frame; gfx::RectF dest_rect_in_frame;
actual_capture_format_ = capture_params().requested_format; actual_capture_format_ = capture_params().requested_format;
actual_capture_format_.pixel_format = media::PIXEL_FORMAT_NV12; actual_capture_format_.pixel_format = media::PIXEL_FORMAT_NV12;
@@ -319,6 +405,7 @@ void CreateStream(SCContentFilter* filter) { @@ -323,6 +409,7 @@ void CreateStream(SCContentFilter* filter) {
stream_ = [[SCStream alloc] initWithFilter:filter stream_ = [[SCStream alloc] initWithFilter:filter
configuration:config configuration:config
delegate:helper_]; delegate:helper_];
@ -219,7 +219,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
{ {
NSError* error = nil; NSError* error = nil;
bool add_stream_output_result = bool add_stream_output_result =
@@ -472,7 +559,7 @@ void OnStreamError() { @@ -480,7 +567,7 @@ void OnStreamError() {
if (fullscreen_module_) { if (fullscreen_module_) {
fullscreen_module_->Reset(); fullscreen_module_->Reset();
} }
@ -228,7 +228,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
} else { } else {
client()->OnError(media::VideoCaptureError::kScreenCaptureKitStreamError, client()->OnError(media::VideoCaptureError::kScreenCaptureKitStreamError,
FROM_HERE, "Stream delegate called didStopWithError"); FROM_HERE, "Stream delegate called didStopWithError");
@@ -495,23 +582,41 @@ void OnUpdateConfigurationError() { @@ -503,23 +590,41 @@ void OnUpdateConfigurationError() {
} }
// IOSurfaceCaptureDeviceBase: // IOSurfaceCaptureDeviceBase:
@ -285,7 +285,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
} }
void OnStop() override { void OnStop() override {
DCHECK(device_task_runner_->RunsTasksInCurrentSequence()); DCHECK(device_task_runner_->RunsTasksInCurrentSequence());
@@ -569,8 +674,9 @@ void ResetStreamTo(SCWindow* window) override { @@ -577,8 +682,9 @@ void ResetStreamTo(SCWindow* window) override {
} }
private: private:
@ -296,7 +296,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
const scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_; const scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
// The actual format of the video frames that are sent to `client`. // The actual format of the video frames that are sent to `client`.
@@ -586,6 +692,10 @@ void ResetStreamTo(SCWindow* window) override { @@ -594,6 +700,10 @@ void ResetStreamTo(SCWindow* window) override {
// Helper class that acts as output and delegate for `stream_`. // Helper class that acts as output and delegate for `stream_`.
ScreenCaptureKitDeviceHelper* __strong helper_; ScreenCaptureKitDeviceHelper* __strong helper_;
@ -307,7 +307,7 @@ index 8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c..8749fa47bd841fd5ae57899cb3447378
// This is used to detect when a captured presentation enters fullscreen mode. // This is used to detect when a captured presentation enters fullscreen mode.
// If this happens, the module will call the ResetStreamTo function. // If this happens, the module will call the ResetStreamTo function.
std::unique_ptr<ScreenCaptureKitFullscreenModule> fullscreen_module_; std::unique_ptr<ScreenCaptureKitFullscreenModule> fullscreen_module_;
@@ -598,6 +708,8 @@ void ResetStreamTo(SCWindow* window) override { @@ -606,6 +716,8 @@ void ResetStreamTo(SCWindow* window) override {
base::WeakPtrFactory<ScreenCaptureKitDeviceMac> weak_factory_{this}; base::WeakPtrFactory<ScreenCaptureKitDeviceMac> weak_factory_{this};
}; };

4
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -112,7 +112,7 @@ index 5c4b8a05034f8defacbc13671fe9bc92f76ade5a..e7390e01f113755613f42d592b36108b
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 cb7b66f1e4cf6d0c44b6e45e5a978a128b9bd0a0..6bced9b3fa92efdd6d6cdcb4cd0423ee7d73b697 100644 index d11d199c44c1f4d72765714d772066d4a36ad8e2..3d5c61726679cedfc6d9e9587eaedfe4ada2f1f9 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
@@ -667,6 +667,9 @@ URLLoader::URLLoader( @@ -667,6 +667,9 @@ URLLoader::URLLoader(
@ -134,7 +134,7 @@ index cb7b66f1e4cf6d0c44b6e45e5a978a128b9bd0a0..6bced9b3fa92efdd6d6cdcb4cd0423ee
url_request_->SetResponseHeadersCallback(base::BindRepeating( url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this))); &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
} }
@@ -2050,6 +2053,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { @@ -2049,6 +2052,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
} }
response_ = BuildResponseHead(); response_ = BuildResponseHead();

4
patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
View file

@ -7,10 +7,10 @@ Subject: feat: filter out non-shareable windows in the current application in
This patch ensures that windows protected via win.setContentProtection(true) do not appear in full display captures via desktopCapturer. This patch could be upstreamed but as the check is limited to in-process windows it doesn't make a lot of sense for Chromium itself. This patch currently has a limitation that it only function for windows created / protected BEFORE the stream is started. There is theoretical future work we can do via polling / observers to automatically update the SCContentFilter when new windows are made but for now this will solve 99+% of the problem and folks can re-order their logic a bit to get it working for their use cases. This patch ensures that windows protected via win.setContentProtection(true) do not appear in full display captures via desktopCapturer. This patch could be upstreamed but as the check is limited to in-process windows it doesn't make a lot of sense for Chromium itself. This patch currently has a limitation that it only function for windows created / protected BEFORE the stream is started. There is theoretical future work we can do via polling / observers to automatically update the SCContentFilter when new windows are made but for now this will solve 99+% of the problem and folks can re-order their logic a bit to get it working for their use cases.
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index 8e7fb47f5f28f40e8e3bd00d2bb1c928112976e4..8d5a5d16fa08b9eb4abcf167a0d5acd8351a582c 100644 index 42705a5c59fb76ba4a6a17a060e215436307de49..7e17594c30ac3cf8cb484b53563b03fc75bd2e0b 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm --- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm +++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -250,8 +250,17 @@ void OnShareableContentCreated(SCShareableContent* content) { @@ -254,8 +254,17 @@ void OnShareableContentCreated(SCShareableContent* content) {
// fallback. See https://crbug.com/325530044. // fallback. See https://crbug.com/325530044.
if (source_.id == display.displayID || if (source_.id == display.displayID ||
source_.id == webrtc::kFullDesktopScreenId) { source_.id == webrtc::kFullDesktopScreenId) {

26
patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
View file

@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
change. change.
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f25d04780 100644 index 91db1bbd912807833243c101e126e42ad5579d2b..7c624e0babddbca7c0deef1d805ccbfc21e6e9a9 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -20,12 +20,16 @@ @@ -20,12 +20,16 @@
@ -50,7 +50,7 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
// Keep the current state. |SetTabWithExclusiveAccess| may change the return // Keep the current state. |SetTabWithExclusiveAccess| may change the return
// value of |IsWindowFullscreenForTabOrPending|. // value of |IsWindowFullscreenForTabOrPending|.
@@ -389,12 +395,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) { @@ -388,12 +394,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
void FullscreenController::FullscreenTabOpeningPopup( void FullscreenController::FullscreenTabOpeningPopup(
content::WebContents* opener, content::WebContents* opener,
content::WebContents* popup) { content::WebContents* popup) {
@ -65,7 +65,7 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
} }
void FullscreenController::OnTabDeactivated( void FullscreenController::OnTabDeactivated(
@@ -484,10 +492,12 @@ void FullscreenController::FullscreenTransitionCompleted() { @@ -483,10 +491,12 @@ void FullscreenController::FullscreenTransitionCompleted() {
#endif // DCHECK_IS_ON() #endif // DCHECK_IS_ON()
tab_fullscreen_target_display_id_ = display::kInvalidDisplayId; tab_fullscreen_target_display_id_ = display::kInvalidDisplayId;
started_fullscreen_transition_ = false; started_fullscreen_transition_ = false;
@ -78,7 +78,7 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
} }
void FullscreenController::RunOrDeferUntilTransitionIsComplete( void FullscreenController::RunOrDeferUntilTransitionIsComplete(
@@ -612,18 +622,17 @@ void FullscreenController::EnterFullscreenModeInternal( @@ -616,18 +626,17 @@ void FullscreenController::EnterFullscreenModeInternal(
// Do not enter fullscreen mode if disallowed by pref. This prevents the user // Do not enter fullscreen mode if disallowed by pref. This prevents the user
// from manually entering fullscreen mode and also disables kiosk mode on // from manually entering fullscreen mode and also disables kiosk mode on
// desktop platforms. // desktop platforms.
@ -97,20 +97,20 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
+#if 0 +#if 0
bool entering_tab_fullscreen = option == TAB && !tab_fullscreen_; bool entering_tab_fullscreen = option == TAB && !tab_fullscreen_;
+#endif +#endif
GURL url; url::Origin origin;
+#if 0 +#if 0
if (option == TAB) { if (option == TAB) {
url = GetRequestingOrigin(); origin = GetRequestingOrigin();
tab_fullscreen_ = true; tab_fullscreen_ = true;
@@ -658,6 +667,7 @@ void FullscreenController::EnterFullscreenModeInternal( @@ -662,6 +671,7 @@ void FullscreenController::EnterFullscreenModeInternal(
url = extension_caused_fullscreen_; origin = url::Origin::Create(extension_url_.value());
} }
} }
+#endif +#endif
fullscreen_start_time_ = base::TimeTicks::Now(); fullscreen_start_time_ = base::TimeTicks::Now();
if (option == BROWSER) { if (option == BROWSER) {
@@ -679,6 +689,7 @@ void FullscreenController::ExitFullscreenModeInternal() { @@ -683,6 +693,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
return; return;
} }
@ -118,7 +118,7 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
// `fullscreen_start_time_` is null if a fullscreen tab moves to a new window. // `fullscreen_start_time_` is null if a fullscreen tab moves to a new window.
if (fullscreen_start_time_ && exclusive_access_tab()) { if (fullscreen_start_time_ && exclusive_access_tab()) {
ukm::SourceId source_id = ukm::SourceId source_id =
@@ -690,15 +701,16 @@ void FullscreenController::ExitFullscreenModeInternal() { @@ -694,15 +705,16 @@ void FullscreenController::ExitFullscreenModeInternal() {
.Record(ukm::UkmRecorder::Get()); .Record(ukm::UkmRecorder::Get());
fullscreen_start_time_.reset(); fullscreen_start_time_.reset();
} }
@ -136,9 +136,9 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
-#endif -#endif
+ +
exclusive_access_manager()->context()->ExitFullscreen(); exclusive_access_manager()->context()->ExitFullscreen();
extension_caused_fullscreen_ = GURL(); extension_url_.reset();
exclusive_access_manager()->UpdateBubble(base::NullCallback()); exclusive_access_manager()->UpdateBubble(base::NullCallback());
@@ -762,8 +774,12 @@ GURL FullscreenController::GetEmbeddingOrigin() const { @@ -766,8 +778,12 @@ url::Origin FullscreenController::GetEmbeddingOrigin() const {
void FullscreenController::RecordMetricsOnFullscreenApiRequested( void FullscreenController::RecordMetricsOnFullscreenApiRequested(
content::RenderFrameHost* requesting_frame) { content::RenderFrameHost* requesting_frame) {
history::HistoryService* service = history::HistoryService* service =
@ -152,7 +152,7 @@ index 458029244ad9db7beace040778117d82d90f4bea..66202201b11de10bf2d781a52640a81f
// Check if the origin has been visited more than a day ago and whether it's // Check if the origin has been visited more than a day ago and whether it's
// on an allowlist, then record those bits of information in a metric. // on an allowlist, then record those bits of information in a metric.
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
index 7fdf883310b13e3334ba007580a1a4287d49d592..d7c2bdaa08cae1645bf52f1d9b9d84b1cdb78c66 100644 index 5854fd8401f3934cabd6abfe48da332d7a670af3..d714c44a6fd2206f9192dbfe82787a4b06042ed0 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
@@ -250,10 +250,12 @@ class FullscreenController : public ExclusiveAccessControllerBase { @@ -250,10 +250,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {

4
patches/chromium/fix_add_method_which_disables_headless_mode_on_native_widget.patch
View file

@ -12,10 +12,10 @@ ui problems (like dissapearing popup during typing in html's
input list. input list.
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 842ea6f7eb2415170a59e46ca955165d656ba149..1ea926753f65baa8f9671fdd63f98fb94c28ba6c 100644 index bfea25523fd1df85d9393fce80259a8654b8a7c2..e3cd3083bc8c19fdc29729d7ff6db7d0fc562ce6 100644
--- a/ui/views/widget/widget.h --- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h
@@ -1200,6 +1200,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, @@ -1209,6 +1209,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// True if widget was created in headless mode. // True if widget was created in headless mode.
bool is_headless() const { return is_headless_; } bool is_headless() const { return is_headless_; }

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

@ -9,10 +9,10 @@ focus node change via TextInputManager.
chromium-bug: https://crbug.com/1369605 chromium-bug: https://crbug.com/1369605
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 9503beefcbcfe7d99674582ece10a7e551fae96d..32302e3dae2098319ed2d1f1403649fe8db2887e 100644 index fec1cdc083d1cb365188a7635a6c062b275d1f64..6098209b367f6b0f0995bd569c895813c6396340 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -3229,6 +3229,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged( @@ -3226,6 +3226,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
} }
} }
@ -87,7 +87,7 @@ index 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac4
// 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 c2e1e3dd3be2a5674a2c05846e15058215ad31dd..6540f14c2c94f78282b298d84e65f4680844eb78 100644 index 1582fba4b9776f405a08150f4783526b79491d60..e806b0d2e59764b6cac2872659de1a10479acdc0 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
@@ -9768,7 +9768,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( @@ -9768,7 +9768,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(

2
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -215,7 +215,7 @@ index 2e2aa78d308157642cf27941fc22a211f6396a0d..c5bcbe1f933f2e79003f7eb9f6368174
mojom::blink::WantResultOption::kWantResult, wait_for_promise); 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 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 d62ee323c27610730da0ddb326f42336080ce6c6..84d8f8cd2241fdcd82305b426f1fe5947fe21e4b 100644 index d6786540b045bbbf8a6b6375ff53f44e4b42c047..8bab0b118fd890d3b8b834b251aee6e032290c9f 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1102,14 +1102,15 @@ void WebLocalFrameImpl::RequestExecuteScript( @@ -1102,14 +1102,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. 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 ecf4bdd5edfd075c8ea0cae05d1d4738f76d6b46..cdc59d103fc40f5efc5630abcca368246f2fd330 100644 index 56cc4be28fd7e456d2cbce9a98776f6020e7b838..97f1c6c646c7c10b4045efdef2518e7796dca000 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
@@ -4723,6 +4723,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( @@ -4742,6 +4742,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange(); request->ResetStateForSiteInstanceChange();
} }

2
patches/chromium/ignore_parse_errors_for_pkey_appusermodel_toastactivatorclsid.patch
View file

@ -11,7 +11,7 @@ Bug: N/A
Change-Id: I9fc472212b2d3afac2c8e18a2159bc2d50bbdf98 Change-Id: I9fc472212b2d3afac2c8e18a2159bc2d50bbdf98
diff --git a/AUTHORS b/AUTHORS diff --git a/AUTHORS b/AUTHORS
index 66e37c775006eaba80440a48b92cce825efd2944..8d03ca899968f24ef73c8563dfe8f13bf4fc6ee8 100644 index 8e9a1a56b64ec10584f0108a06c4ccbfbe658642..9fdc5dc63935ddb773b4f7d648425c0420f1c467 100644
--- a/AUTHORS --- a/AUTHORS
+++ b/AUTHORS +++ b/AUTHORS
@@ -340,6 +340,7 @@ David Futcher <david.mike.futcher@gmail.com> @@ -340,6 +340,7 @@ David Futcher <david.mike.futcher@gmail.com>

6
patches/chromium/make_gtk_getlibgtk_public.patch
View file

@ -7,10 +7,10 @@ Allows embedders to get a handle to the gdk_pixbuf
library already loaded in the process. library already loaded in the process.
diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
index d93d9b94c7ba4cfecb98ac256b0dd12e4ad8e01c..dc88b6668ac8f084c31b338aed61ad62df4c3f6c 100644 index d6ac3233de3165d2be3e5d4fb3e221dca8b8d415..4f15069af07b7adc3e3c45e67e23ec8525668c21 100644
--- a/ui/gtk/gtk_compat.cc --- a/ui/gtk/gtk_compat.cc
+++ b/ui/gtk/gtk_compat.cc +++ b/ui/gtk/gtk_compat.cc
@@ -68,11 +68,6 @@ void* GetLibGio() { @@ -69,11 +69,6 @@ void* GetLibGio() {
return libgio; return libgio;
} }
@ -22,7 +22,7 @@ index d93d9b94c7ba4cfecb98ac256b0dd12e4ad8e01c..dc88b6668ac8f084c31b338aed61ad62
void* GetLibGdk3() { void* GetLibGdk3() {
static void* libgdk3 = DlOpen("libgdk-3.so.0"); static void* libgdk3 = DlOpen("libgdk-3.so.0");
return libgdk3; return libgdk3;
@@ -146,6 +141,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) { @@ -150,6 +145,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
} // namespace } // namespace

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

@ -269,11 +269,11 @@ index e9f4e5131238b9fb5f1b4b3e90a0cb84a7fc15b4..8b5f4cae3123ac5480ad73f0c873fca0
} // namespace } // 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 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 19fff43c3daaef5451b6b60b84a610a21311448e..240b954661d34fcc4329d39490be33c485fa8b6e 100644 index 92646b4978457724d46eb526d6f34cd308562f0b..c3e669ed8fb0682f7f973bb1c69d069bd6a3aa0c 100644
--- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm --- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
+++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm +++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
@@ -9,7 +9,9 @@ @@ -9,7 +9,9 @@
#include "components/remote_cocoa/app_shim/features.h" #include "base/mac/mac_util.h"
#include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
#include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h" #include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h"
+#include "electron/mas.h" +#include "electron/mas.h"
@ -298,7 +298,7 @@ index 19fff43c3daaef5451b6b60b84a610a21311448e..240b954661d34fcc4329d39490be33c4
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime. // - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
if ([BrowserWindowFrame class]) if ([BrowserWindowFrame class])
@@ -165,6 +170,8 @@ - (BOOL)_usesCustomDrawing { @@ -164,6 +169,8 @@ - (BOOL)_usesCustomDrawing {
return NO; return NO;
} }
@ -307,7 +307,7 @@ index 19fff43c3daaef5451b6b60b84a610a21311448e..240b954661d34fcc4329d39490be33c4
// Handle "Move focus to the window toolbar" configured in System Preferences -> // Handle "Move focus to the window toolbar" configured in System Preferences ->
// Keyboard -> Shortcuts -> Keyboard. Usually Ctrl+F5. The argument (|unknown|) // Keyboard -> Shortcuts -> Keyboard. Usually Ctrl+F5. The argument (|unknown|)
// tends to just be nil. // tends to just be nil.
@@ -175,8 +182,8 @@ - (void)_handleFocusToolbarHotKey:(id)unknown { @@ -174,8 +181,8 @@ - (void)_handleFocusToolbarHotKey:(id)unknown {
} }
- (void)setAlwaysShowTrafficLights:(BOOL)alwaysShow { - (void)setAlwaysShowTrafficLights:(BOOL)alwaysShow {
@ -792,7 +792,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 2c5c9ae4e2ba0d20c432d5cf3ec1b816cda0117b..ddcbfff7dffa23bd09843df90b7bdb8e8d9e0f10 100644 index 482a1721cb2157f0221c901423423aab37efdaf0..b736432543ab619af6483070895f8968248fd71f 100644
--- a/content/test/BUILD.gn --- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -658,6 +658,7 @@ static_library("test_support") { @@ -658,6 +658,7 @@ static_library("test_support") {
@ -819,7 +819,7 @@ index 2c5c9ae4e2ba0d20c432d5cf3ec1b816cda0117b..ddcbfff7dffa23bd09843df90b7bdb8e
] ]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3262,6 +3265,7 @@ test("content_unittests") { @@ -3263,6 +3266,7 @@ test("content_unittests") {
"//ui/shell_dialogs:shell_dialogs", "//ui/shell_dialogs:shell_dialogs",
"//ui/webui:test_support", "//ui/webui:test_support",
"//url", "//url",

18
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View file

@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback. session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 93819317332d7439fcc4fde2e6107704534ed16e..dd7a74cd1faa4486cb5be6598a5b8e36c94aaed2 100644 index 8529c98678d7a671cea947a864d0c13e031a153a..771fee7092bb25e4f7546941a04647d060e966c2 100644
--- a/services/network/network_context.cc --- a/services/network/network_context.cc
+++ b/services/network/network_context.cc +++ b/services/network/network_context.cc
@@ -159,6 +159,11 @@ @@ -159,6 +159,11 @@
@ -136,7 +136,7 @@ index 93819317332d7439fcc4fde2e6107704534ed16e..dd7a74cd1faa4486cb5be6598a5b8e36
void NetworkContext::CreateURLLoaderFactory( void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver, mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) { mojom::URLLoaderFactoryParamsPtr params) {
@@ -2579,6 +2684,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2617,6 +2722,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
cert_verifier = std::make_unique<net::CachingCertVerifier>( cert_verifier = std::make_unique<net::CachingCertVerifier>(
std::make_unique<net::CoalescingCertVerifier>( std::make_unique<net::CoalescingCertVerifier>(
std::move(cert_verifier))); std::move(cert_verifier)));
@ -148,7 +148,7 @@ index 93819317332d7439fcc4fde2e6107704534ed16e..dd7a74cd1faa4486cb5be6598a5b8e36
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier( builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h diff --git a/services/network/network_context.h b/services/network/network_context.h
index dea6260bc08d4edf93df4afd4d01252f638694c0..fe04f634b32e503f6e93ae6f20c8c7f7c85d02be 100644 index f2dcec57a22d95892a08f1fa43696d6eea46a820..930e0bd987c48d111b2c8d71147c09e4418bda6c 100644
--- a/services/network/network_context.h --- a/services/network/network_context.h
+++ b/services/network/network_context.h +++ b/services/network/network_context.h
@@ -113,6 +113,7 @@ class URLMatcher; @@ -113,6 +113,7 @@ class URLMatcher;
@ -159,7 +159,7 @@ index dea6260bc08d4edf93df4afd4d01252f638694c0..fe04f634b32e503f6e93ae6f20c8c7f7
class CookieManager; class CookieManager;
class HostResolver; class HostResolver;
class MdnsResponderManager; class MdnsResponderManager;
@@ -245,6 +246,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext @@ -249,6 +250,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CreateURLLoaderFactory( void CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver, mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) override; mojom::URLLoaderFactoryParamsPtr params) override;
@ -168,7 +168,7 @@ index dea6260bc08d4edf93df4afd4d01252f638694c0..fe04f634b32e503f6e93ae6f20c8c7f7
void ResetURLLoaderFactories() override; void ResetURLLoaderFactories() override;
void GetViaObliviousHttp( void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request, mojom::ObliviousHttpRequestPtr request,
@@ -932,6 +935,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext @@ -962,6 +965,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_; std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED) #endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@ -178,10 +178,10 @@ index dea6260bc08d4edf93df4afd4d01252f638694c0..fe04f634b32e503f6e93ae6f20c8c7f7
std::unique_ptr<HostResolver> internal_host_resolver_; std::unique_ptr<HostResolver> internal_host_resolver_;
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator> std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index be45c88ba85713a2499b93c9b52d09a201903e9d..48e3d3b3587e15d13e9048c9f61d9dcdd8c7acee 100644 index 5cfbf71f644b391009d533132621a4ece224bfd3..773049b72e7784d396bb9cd1ebd29c3a523e7454 100644
--- a/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom
@@ -307,6 +307,17 @@ struct SocketBrokerRemotes { @@ -308,6 +308,17 @@ struct SocketBrokerRemotes {
pending_remote<SocketBroker> server; pending_remote<SocketBroker> server;
}; };
@ -199,7 +199,7 @@ index be45c88ba85713a2499b93c9b52d09a201903e9d..48e3d3b3587e15d13e9048c9f61d9dcd
// Parameters for constructing a network context. // Parameters for constructing a network context.
struct NetworkContextParams { struct NetworkContextParams {
// The user agent string. // The user agent string.
@@ -938,6 +949,9 @@ interface NetworkContext { @@ -939,6 +950,9 @@ interface NetworkContext {
// Sets a client for this network context. // Sets a client for this network context.
SetClient(pending_remote<NetworkContextClient> client); SetClient(pending_remote<NetworkContextClient> client);
@ -210,7 +210,7 @@ index be45c88ba85713a2499b93c9b52d09a201903e9d..48e3d3b3587e15d13e9048c9f61d9dcd
CreateURLLoaderFactory( CreateURLLoaderFactory(
pending_receiver<URLLoaderFactory> url_loader_factory, pending_receiver<URLLoaderFactory> url_loader_factory,
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index fc22fd2d7fa864dc565c99b0d36b2d31a8e13eaf..97e8f9f145cecad9b0cd8b43a2de4af29cec7778 100644 index e9579ae8911ebf4a89404564cad13de200cce9ea..da8551db16849cf82a6e3a7eaeb451cae0707f2d 100644
--- a/services/network/test/test_network_context.h --- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h +++ b/services/network/test/test_network_context.h
@@ -63,6 +63,8 @@ class TestNetworkContext : public mojom::NetworkContext { @@ -63,6 +63,8 @@ class TestNetworkContext : public mojom::NetworkContext {

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 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 559f05089b4381fd44dac68c4bc2b1673135f7ff..01364e3ce096312c9ce4f61932eec39521af14c0 100644 index d452146f7bb489a7f41efe2dd8fa6ff5d692bef3..055579b484581b2367f4263f17695081e57e97bf 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
@@ -804,8 +804,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch( @@ -804,8 +804,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(

6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -44,7 +44,7 @@ index f13799f1cc440a20d8e3c55ee35f64e6505e5590..e46e5eb74c54bc00ead6e2e4eff99fd5
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 d204a45939c7318697c5eb0d6efe7bc7fe94b4d1..2fb39006ca697d3b16507e3000bff2768b334092 100644 index 690a8feaee2ecc0d099cbc729ca3cd3b0281d53e..a39fc6900b8c4dfc1467a9498fdfb68eb6b27bd0 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
@@ -5810,6 +5810,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -5810,6 +5810,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@ -60,10 +60,10 @@ index d204a45939c7318697c5eb0d6efe7bc7fe94b4d1..2fb39006ca697d3b16507e3000bff276
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 b2b0f8b3419fee618c25988348e4efc6db971d80..c14e61add66bb8fd6b4d9e96b92eb7a3ffb029b7 100644 index 03b395f30302bd240c2059dc4ff218351ad2642b..27667ad11d481fcbaa59542800b7b001cb6176f0 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
@@ -1174,6 +1174,7 @@ class CONTENT_EXPORT WebContentsImpl @@ -1176,6 +1176,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;

2
patches/chromium/refactor_unfilter_unresponsive_events.patch
View file

@ -15,7 +15,7 @@ This CL removes these filters so the unresponsive event can still be
accessed from our JS event. The filtering is moved into Electron's code. accessed from our JS event. The filtering is moved into Electron's code.
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 f4bebb35fe53e4fd68bd8519a0bfab8414b64bda..7fb622c71ff6852f39f4cd2cd8472811c459e84f 100644 index 3a991c6ace931ec17ea36737e24146b7836fafe4..5d624bda595f2e52ff8aef3c968fdd46c560ca9b 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
@@ -9905,25 +9905,13 @@ void WebContentsImpl::RendererUnresponsive( @@ -9905,25 +9905,13 @@ void WebContentsImpl::RendererUnresponsive(

4
patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch
View file

@ -233,7 +233,7 @@ index 2991489fae8a4eecad97b1ecb2271f096d9a9229..93b7aa620ad1da250ac06e3383ca6897
} }
diff --git a/content/common/features.cc b/content/common/features.cc diff --git a/content/common/features.cc b/content/common/features.cc
index a726d2b8dadba15c22c32872ca18444a8b5e86c6..0bbd5a2296d3063c0b015579213fe51a7aee69b1 100644 index b6c032770c004363bded8f7c96a3c7e57d8adb7f..63789d8f1509f350697cd4703c835dd9f06fc203 100644
--- a/content/common/features.cc --- a/content/common/features.cc
+++ b/content/common/features.cc +++ b/content/common/features.cc
@@ -255,6 +255,14 @@ BASE_FEATURE(kIOSurfaceCapturer, @@ -255,6 +255,14 @@ BASE_FEATURE(kIOSurfaceCapturer,
@ -252,7 +252,7 @@ index a726d2b8dadba15c22c32872ca18444a8b5e86c6..0bbd5a2296d3063c0b015579213fe51a
// invalidated upon notifications sent by base::SystemMonitor. If disabled, the // invalidated upon notifications sent by base::SystemMonitor. If disabled, the
// cache is considered invalid on every enumeration request. // cache is considered invalid on every enumeration request.
diff --git a/content/common/features.h b/content/common/features.h diff --git a/content/common/features.h b/content/common/features.h
index 38a2138268031964bed5bc2570af9fea4adabe0e..55492b0fef2f174fa39199f23d11564686af4b4d 100644 index 7f17700db960cf799b0dffd79a734db236efcc61..95aae28d7cf4794fc0beb1d3b8cadf5947405c5d 100644
--- a/content/common/features.h --- a/content/common/features.h
+++ b/content/common/features.h +++ b/content/common/features.h
@@ -67,6 +67,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan); @@ -67,6 +67,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan);

8
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 6992093d069f0d9a50eab29cdd36bffba586eca9..deae9c82c8cce046732510263faf758756c77cfa 100644 index 4e15fbef46935b7f3ac94f04eecba6c6dc24e3d0..2f7d9e60679d690d48ed7285c1c704192e3e3b67 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
@@ -3882,6 +3882,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3882,6 +3882,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@ -35,10 +35,10 @@ index 6992093d069f0d9a50eab29cdd36bffba586eca9..deae9c82c8cce046732510263faf7587
CHECK(view_.get()); CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index b089f34509e0c519471dafe192a7f21d6898f78f..50196ee738e7a6ad8b628b8dc5097c2a81484f1c 100644 index bd96da3279848cd351d35fb02d306101e4e587b1..9cabbb8c57267000139816fbc1d17f9d4cec0753 100644
--- a/content/public/browser/web_contents.h --- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h
@@ -118,10 +118,13 @@ class BrowserPluginGuestDelegate; @@ -119,10 +119,13 @@ class BrowserPluginGuestDelegate;
class GuestPageHolder; class GuestPageHolder;
class RenderFrameHost; class RenderFrameHost;
class RenderViewHost; class RenderViewHost;
@ -52,7 +52,7 @@ index b089f34509e0c519471dafe192a7f21d6898f78f..50196ee738e7a6ad8b628b8dc5097c2a
class WebUI; class WebUI;
struct DropData; struct DropData;
struct MHTMLGenerationParams; struct MHTMLGenerationParams;
@@ -267,6 +270,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData { @@ -268,6 +271,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData {
network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags starting_sandbox_flags =
network::mojom::WebSandboxFlags::kNone; network::mojom::WebSandboxFlags::kNone;

4
patches/chromium/webview_fullscreen.patch
View file

@ -15,7 +15,7 @@ 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 ee3ea03f0c60066330bc5c9f02e4c2beeafd136b..559f05089b4381fd44dac68c4bc2b1673135f7ff 100644 index d1c86dcadcbd134ce4585e02c9e2d63d6c9ca3f7..d452146f7bb489a7f41efe2dd8fa6ff5d692bef3 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
@@ -8737,6 +8737,17 @@ void RenderFrameHostImpl::EnterFullscreen( @@ -8737,6 +8737,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@ -37,7 +37,7 @@ index ee3ea03f0c60066330bc5c9f02e4c2beeafd136b..559f05089b4381fd44dac68c4bc2b167
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 deae9c82c8cce046732510263faf758756c77cfa..c2e1e3dd3be2a5674a2c05846e15058215ad31dd 100644 index 2f7d9e60679d690d48ed7285c1c704192e3e3b67..1582fba4b9776f405a08150f4783526b79491d60 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
@@ -4157,21 +4157,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent( @@ -4157,21 +4157,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(

2
shell/browser/api/electron_api_web_contents.cc
View file

@ -1400,7 +1400,7 @@ bool WebContents::IsFullscreen() const {
return owner_window()->IsFullscreen() || is_html_fullscreen(); return owner_window()->IsFullscreen() || is_html_fullscreen();
} }
void WebContents::EnterFullscreen(const GURL& url, void WebContents::EnterFullscreen(const url::Origin& origin,
ExclusiveAccessBubbleType bubble_type, ExclusiveAccessBubbleType bubble_type,
const int64_t display_id) {} const int64_t display_id) {}

2
shell/browser/api/electron_api_web_contents.h
View file

@ -684,7 +684,7 @@ class WebContents final : public ExclusiveAccessContext,
// ExclusiveAccessContext: // ExclusiveAccessContext:
Profile* GetProfile() override; Profile* GetProfile() override;
bool IsFullscreen() const override; bool IsFullscreen() const override;
void EnterFullscreen(const GURL& url, void EnterFullscreen(const url::Origin& origin,
ExclusiveAccessBubbleType bubble_type, ExclusiveAccessBubbleType bubble_type,
const int64_t display_id) override; const int64_t display_id) override;
void ExitFullscreen() override {} void ExitFullscreen() override {}

4
shell/browser/ui/views/autofill_popup_view.cc
View file

@ -73,7 +73,9 @@ void AutofillPopupView::Show() {
// a weak pointer to hold the reference and don't have to worry about // a weak pointer to hold the reference and don't have to worry about
// deletion. // deletion.
auto* widget = new views::Widget; auto* widget = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); views::Widget::InitParams params{
views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET,
views::Widget::InitParams::TYPE_POPUP};
params.delegate = this; params.delegate = this;
params.parent = parent_widget_->GetNativeView(); params.parent = parent_widget_->GetNativeView();
params.z_order = ui::ZOrderLevel::kFloatingUIElement; params.z_order = ui::ZOrderLevel::kFloatingUIElement;

12
shell/browser/ui/webui/accessibility_ui.cc
View file

@ -78,7 +78,7 @@ constexpr std::string_view kLocked = "locked";
constexpr std::string_view kNative = "native"; constexpr std::string_view kNative = "native";
constexpr std::string_view kPage = "page"; constexpr std::string_view kPage = "page";
constexpr std::string_view kPDFPrinting = "pdfPrinting"; constexpr std::string_view kPDFPrinting = "pdfPrinting";
constexpr std::string_view kScreenReader = "screenreader"; constexpr std::string_view kExtendedProperties = "extendedProperties";
constexpr std::string_view kShowOrRefreshTree = "showOrRefreshTree"; constexpr std::string_view kShowOrRefreshTree = "showOrRefreshTree";
constexpr std::string_view kText = "text"; constexpr std::string_view kText = "text";
constexpr std::string_view kWeb = "web"; constexpr std::string_view kWeb = "web";
@ -165,7 +165,7 @@ void HandleAccessibilityRequestCallback(
bool native = mode.has_mode(ui::AXMode::kNativeAPIs); bool native = mode.has_mode(ui::AXMode::kNativeAPIs);
bool web = mode.has_mode(ui::AXMode::kWebContents); bool web = mode.has_mode(ui::AXMode::kWebContents);
bool text = mode.has_mode(ui::AXMode::kInlineTextBoxes); bool text = mode.has_mode(ui::AXMode::kInlineTextBoxes);
bool screenreader = mode.has_mode(ui::AXMode::kScreenReader); bool extendedProperties = mode.has_mode(ui::AXMode::kExtendedProperties);
bool html = mode.has_mode(ui::AXMode::kHTML); bool html = mode.has_mode(ui::AXMode::kHTML);
bool pdf_printing = mode.has_mode(ui::AXMode::kPDFPrinting); bool pdf_printing = mode.has_mode(ui::AXMode::kPDFPrinting);
@ -174,12 +174,12 @@ void HandleAccessibilityRequestCallback(
data.Set(kNative, is_native_enabled ? (native ? kOn : kOff) : kDisabled); data.Set(kNative, is_native_enabled ? (native ? kOn : kOff) : kDisabled);
data.Set(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled); data.Set(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled);
// The "text", "screenreader" and "html" flags are only // The "text", "extendedProperties" and "html" flags are only
// meaningful if "web" is enabled. // meaningful if "web" is enabled.
bool is_web_enabled = is_native_enabled && web; bool is_web_enabled = is_native_enabled && web;
data.Set(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled); data.Set(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled);
data.Set(kScreenReader, data.Set(kExtendedProperties,
is_web_enabled ? (screenreader ? kOn : kOff) : kDisabled); is_web_enabled ? (extendedProperties ? kOn : kOff) : kDisabled);
data.Set(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled); data.Set(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled);
// The "pdfPrinting" flag is independent of the others. // The "pdfPrinting" flag is independent of the others.
@ -246,7 +246,7 @@ void HandleAccessibilityRequestCallback(
base::Value::Dict descriptor = BuildTargetDescriptor(rvh); base::Value::Dict descriptor = BuildTargetDescriptor(rvh);
descriptor.Set(kNative, is_native_enabled); descriptor.Set(kNative, is_native_enabled);
descriptor.Set(kScreenReader, is_web_enabled && screenreader); descriptor.Set(kExtendedProperties, is_web_enabled && extendedProperties);
descriptor.Set(kWeb, is_web_enabled); descriptor.Set(kWeb, is_web_enabled);
page_list.Append(std::move(descriptor)); page_list.Append(std::move(descriptor));
} }