mirrors/electron
0
0 Fork 0
mirror of https://github.com/electron/electron.git synced 2026-10-28 11:44:46 +08:00
Code Activity

chore: bump chromium to 154.0.8029.0 (main) (#53243)

Browse Source 
* chore: bump chromium in DEPS to 154.0.8028.0

* 8220808: [dcheck-to-check] Convert DCHECKs in content/browser/ [1/n]

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8220808

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore: update patches

* 8300492: Remove VideoOverlayWindow::Create() layering hack

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8300492

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* 8285178: [Extensions] Native messaging: Add signing certificate parsing (Android)

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8285178

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore: bump chromium in DEPS to 154.0.8029.0

* 8302776: Revert "[dcheck-to-check] Convert DCHECKs in content/browser/ [1/n]"

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8302776

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore: update patches

* 8287330: Move component extension loadTimeData to ExtensionConfigProvider

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8287330

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* 8292758: Explicitly call ScriptStateImpl::Create instead of ScriptState::Create()

Upstream removed ScriptState::Create and its create-callback indirection;
construct blink::ScriptStateImpl directly like shadow_realm_context.cc.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8292758

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fixup! 8300492: Remove VideoOverlayWindow::Create() layering hack

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: electron-claude[bot] <279139701+electron-claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot]Claude Fable 5electron-claude[bot]deepak1556
 authored and GitHub committed 2026-08-28 16:46:19 -07:00
1 parent c31af002cd
commit fdf81540ed
54 files changed
+202 -231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

DEPS
+1 -1
View File
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'154.0.8025.0',
'154.0.8029.0',
'node_version':
'v24.19.0',
'nan_version':
chromium_src/BUILD.gn
+1
View File
@@ -80,6 +80,7 @@ static_library("chrome") {
"//chrome/browser/picture_in_picture/picture_in_picture_window_manager_uma_helper.h",
"//chrome/browser/picture_in_picture/scoped_picture_in_picture_occlusion_observation.cc",
"//chrome/browser/picture_in_picture/scoped_picture_in_picture_occlusion_observation.h",
"//chrome/browser/picture_in_picture/video_overlay_window.h",
"//chrome/browser/platform_util.cc",
"//chrome/browser/platform_util.h",
"//chrome/browser/predictors/predictors_features.cc",
patches/boringssl/expose_ripemd160.patch
+1 -1
View File
@@ -82,7 +82,7 @@ index 584b1390a841cc1b1dcb69e16d8242a88e4bb9cb..637aeccb8de8d793eabc38e32bef6834
void EVP_MD_do_all(void (*callback)(const EVP_MD *md, const char *name,
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
index d9f46d63e797686a05319494392d74ed39173b01..b21f714febffcbb22312bf35034acdb95e027a4a 100644
index 8a81bc1a4d0e4a28fae950f91b3e7dffc977756d..d8c097c20ddf056542c950aea6964be5c8f0953c 100644
--- a/include/openssl/digest.h
+++ b/include/openssl/digest.h
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
patches/boringssl/feat_expose_several_extra_cipher_functions.patch
+1 -1
View File
@@ -118,7 +118,7 @@ index 637aeccb8de8d793eabc38e32bef6834ac0e6ad3..c5dd0b18d7338457e47ae47088d98224
callback(EVP_des_ede3_cbc(), "des-ede3-cbc", nullptr, arg);
callback(EVP_rc2_cbc(), "rc2-cbc", nullptr, arg);
diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
index 1410f33d7fc6545a94b1b30cea21f21cbaa71644..05d31f905427c2342972b532b3f778beb5f289f8 100644
index 9ca8d2782dacb07b7a2cf9b1756eab3368aa486b..4abf7fa559b5fb6e77abbd0d9a071a6ca57ec51d 100644
--- a/include/openssl/cipher.h
+++ b/include/openssl/cipher.h
@@ -635,6 +635,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
patches/chromium/add_didinstallconditionalfeatures.patch
+6 -6
View File
@@ -23,10 +23,10 @@ index 777084a902881df5b5107ecb596e2225aad36281..f6771b8b6c1db5f00cde78877a3c2bdf
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 33cf423de70edbec726d1664dbb5c3efd3065ba6..8238ff2ab588e2619fa21cabda9a4cccc4facc7a 100644
index cb52bdc38249f88019a2894e1cf776aaec13e295..b54f981376e4624c88124b7a44968952f32e36c5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4981,6 +4981,13 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4982,6 +4982,13 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
}
}
@@ -68,10 +68,10 @@ index b5522c813c4ba974ed46c2022830bdbd15e40a22..073e5665d8aa43b4c6d5337f25c2c514
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 98678602b7ec0263e51dfcfda29264b7d75854e9..0e873a3cd1693ebf310b720ab954c482e922d5a6 100644
index 57c48e2ca9a775ebb17b236dc7757efd2b0f460c..27586bd03af05294eb977a72052f2334c3d1aa61 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -308,6 +308,7 @@ void LocalWindowProxy::Initialize() {
@@ -309,6 +309,7 @@ void LocalWindowProxy::Initialize() {
}
InstallConditionalFeatures();
@@ -124,10 +124,10 @@ index c0402f39baabf1fecff46ed0515dba499de54211..2381b103b6a77519eeacb0edd18465f9
int32_t world_id) override;
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index b4d527ccb8ca88385a3a5d367b11ca8238589dde..e174b694f33c4ac9e99ac37fe545a04debc3fc99 100644
index b8c417251a2d839e20b4b5aa80925d84e48e21ae..a93b96c076fa528fca8848cee46a06952acc4acb 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -429,6 +429,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -432,6 +432,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) override {}
patches/chromium/allow_authenticator_responses_to_override_client_data_json.patch
+3 -3
View File
@@ -15,10 +15,10 @@ When present, authenticator_common_impl uses it in place of the request-
level client_data_json.
diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/browser/webauth/authenticator_common_impl.cc
index 880bfb5066403cc0d9dd5baeb88266dd08d440f9..e5e9d55a51eaef7b8bdf822bab69e35388f06310 100644
index 88ea0deac6864ad33ffff02f7091d68b83c4921f..851c668c990d571cafbd8709ea22dc14e34083fe 100644
--- a/content/browser/webauth/authenticator_common_impl.cc
+++ b/content/browser/webauth/authenticator_common_impl.cc
@@ -2889,8 +2889,12 @@ AuthenticatorCommonImpl::CreateMakeCredentialResponse(
@@ -3061,8 +3061,12 @@ AuthenticatorCommonImpl::CreateMakeCredentialResponse(
AttestationErasureOption attestation_erasure) {
auto response = blink::mojom::MakeCredentialAuthenticatorResponse::New();
auto common_info = blink::mojom::CommonCredentialInfo::New();
@@ -33,7 +33,7 @@ index 880bfb5066403cc0d9dd5baeb88266dd08d440f9..e5e9d55a51eaef7b8bdf822bab69e353
common_info->raw_id = response_data.attestation_object.GetCredentialId();
common_info->id = webauthn::Base64UrlEncodeOmitPadding(common_info->raw_id);
@@ -3099,8 +3103,12 @@ AuthenticatorCommonImpl::CreateGetAssertionResponse(
@@ -3271,8 +3275,12 @@ AuthenticatorCommonImpl::CreateGetAssertionResponse(
auto common_info = blink::mojom::CommonCredentialInfo::New();
auto response_extensions =
blink::mojom::AuthenticationExtensionsClientOutputs::New();
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+2 -2
View File
@@ -23,10 +23,10 @@ index b1f2c21911a15c51dffc183880b432edfbf132ab..977b6a9869aa45628aaa0aa7734ce568
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 44f3b299c2242aa19693685ed6e1f81f5b7bd7af..37cff9cef7de8daf39c8c2dc405c9f4b59c261bc 100644
index 5d8a61248db78a90f0a6c8a38b25a85bbcf16a72..d2a849d3d785319b9a13024eba80eb64d1d37a69 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -752,6 +752,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -755,6 +755,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
}
patches/chromium/build_disable_llvm_unroll-add-parallel-reductions_on_apple_targets.patch
+1 -1
View File
@@ -22,7 +22,7 @@ This patch can be removed once the upstream fix
(llvm/llvm-project#201066) ships in the bundled clang.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 3351d93dfdefaeb537e117402efd0f7bc29fa5d2..75cbc104be39c9a26d3c191ac629797cf781df75 100644
index 652107318f2f04016055cf84eecdd003e63afd87..43b91521718dbebf54cba5df462008c5c5a9ca79 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -802,6 +802,16 @@ config("compiler") {
patches/chromium/can_create_window.patch
+12 -12
View File
@@ -12,10 +12,10 @@ that the new window is created in its own BrowsingInstance (and process).
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 898811bca51c874d42b7efad3137faa0376aa401..21063c58e982092c6de635d46eaf728b47d2b708 100644
index ceacd68a0a267e8b813d29e6b0da20d4870905be..5e3fd5f266523636a8ecd61ac81e4112eb34ef15 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10620,6 +10620,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10632,6 +10632,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,
@@ -23,7 +23,7 @@ index 898811bca51c874d42b7efad3137faa0376aa401..21063c58e982092c6de635d46eaf728b
effective_transient_activation_state, params->opener_suppressed,
&no_javascript_access);
@@ -10630,6 +10631,11 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10642,6 +10643,11 @@ void RenderFrameHostImpl::CreateNewWindow(
return;
}
@@ -36,10 +36,10 @@ index 898811bca51c874d42b7efad3137faa0376aa401..21063c58e982092c6de635d46eaf728b
// important to do this before we return from the |opener_suppressed| case
// below.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 69e4db4790b759935b01441095970b24b8a8d70b..94bbc849d8b3e7e513af3b3250d8fbe46c1ec69b 100644
index 0d07dd8bf2dd38614b8f54aa0377211308625ca4..983513eea85af542a8f7074a2c8280aebddf670d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5705,6 +5705,10 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -5706,6 +5706,10 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.initially_hidden = renderer_started_hidden;
create_params.initial_popup_url = params.target_url;
@@ -50,7 +50,7 @@ index 69e4db4790b759935b01441095970b24b8a8d70b..94bbc849d8b3e7e513af3b3250d8fbe4
// Even though all codepaths leading here are in response to a renderer
// trying to open a new window, if the new window ends up in a different
// browsing instance, then the RenderViewHost, RenderWidgetHost,
@@ -5759,6 +5763,13 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -5760,6 +5764,13 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// Sets the newly created WebContents WindowOpenDisposition.
new_contents_impl->original_window_open_disposition_ = params.disposition;
@@ -64,7 +64,7 @@ index 69e4db4790b759935b01441095970b24b8a8d70b..94bbc849d8b3e7e513af3b3250d8fbe4
// 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
@@ -5800,13 +5811,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -5801,13 +5812,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@@ -107,7 +107,7 @@ index 6499e2f1fedb93031d97e3142404b4c3759e237e..988d83fdf70abec970f96188d3cb755a
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 84a2eeadb95b6d8cae2bc7338eee13fe3d496203..8bb776827d657496abec10c2bef1b7682f9af10c 100644
index 933ff42f840d51de2ffa0b65a75405b957b06204..19e2f07459a67f59d4a7a51d588750e96736a842 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -202,6 +202,7 @@ class TrustedURLLoaderHeaderClient;
@@ -118,7 +118,7 @@ index 84a2eeadb95b6d8cae2bc7338eee13fe3d496203..8bb776827d657496abec10c2bef1b768
} // namespace network
namespace sandbox {
@@ -1269,6 +1270,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1271,6 +1272,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -188,10 +188,10 @@ index c3d8d88a3e436515e6f44e0725123ecd56bb76f1..7ad0f8004e2f454b71d866d533f69ae8
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f52f4d399f2524a80b184932a1c6e97596c5fa4b..33cf423de70edbec726d1664dbb5c3efd3065ba6 100644
index fedf27a0b00ced794768b34420a5fac4562ef49f..cb52bdc38249f88019a2894e1cf776aaec13e295 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -7149,6 +7149,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -7150,6 +7150,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
params->started_by_ad =
GetWebFrame()->IsAdFrame() || GetWebFrame()->IsAdScriptInStack();
@@ -242,7 +242,7 @@ index 1208199428a2de729650c82e988ab67abeb0e786..2e6643ede047a580a636dbf75e86c99f
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 91f3d4d522a9c8c2bf53064c8f8825bfa1dda538..e446c059c2c382d25cea99a3f0e3f4cd065e4d4c 100644
index 96269e2a1b2f77ab901d6137fbb54c8ae9089a25..2986d3ba759ae6312f82159ef1b1810af292ba90 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2492,6 +2492,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
patches/chromium/chore_add_electron_deps_to_gitignores.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores
Makes things like "git status" quicker when developing electron locally
diff --git a/.gitignore b/.gitignore
index 5dced72c40f606c702be3b4ebdb4a17bf37b5784..3cee3ca78222080e62422b016872b4f18c7582bb 100644
index 63b0d3675470991a21eaac11e6d127e986edf279..69fb120b9a37eb0f15268a7f992c9c867af82d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -227,6 +227,7 @@ vs-chromium-project.txt
@@ -228,6 +228,7 @@ vs-chromium-project.txt
/data
/delegate_execute
/device/serial/device_serial_mojo.xml
patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch
+6 -6
View File
@@ -34,10 +34,10 @@ index f6771b8b6c1db5f00cde78877a3c2bdf5a38d61a..800eb200f8a9e4b7b44a4d22c0cf169c
virtual void DidClearWindowObject() {}
virtual void DidChangeScrollOffset() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 8238ff2ab588e2619fa21cabda9a4cccc4facc7a..751f651fafe5de0ccbee442f76ee9dc42e087e30 100644
index b54f981376e4624c88124b7a44968952f32e36c5..540aa229335c567fc4fe2c2776899199c8a0e761 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4988,10 +4988,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
@@ -4989,10 +4989,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
}
}
@@ -181,10 +181,10 @@ index 073e5665d8aa43b4c6d5337f25c2c5148e638d5b..facf77563630fd84fb4b61a64f86ecc5
// Geometry notifications ----------------------------------------------
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 0e873a3cd1693ebf310b720ab954c482e922d5a6..fea09452ab756c2663722df38bfe337d314d0451 100644
index 27586bd03af05294eb977a72052f2334c3d1aa61..fdceecae58237c48777b800ca218b2ade3e6bd44 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -193,11 +193,12 @@ void LocalWindowProxy::DisposeContext(Lifecycle next_status,
@@ -194,11 +194,12 @@ void LocalWindowProxy::DisposeContext(Lifecycle next_status,
ScriptState::Scope scope(script_state_);
v8::Local<v8::Context> context = script_state_->GetContext();
@@ -245,10 +245,10 @@ index 2381b103b6a77519eeacb0edd18465f9d79feba9..30c1da16453b564e19b4675e5e6f5aff
bool HasWebView() const override;
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index e174b694f33c4ac9e99ac37fe545a04debc3fc99..1712497a502653de69ceba1ee8eda9b765e2927e 100644
index a93b96c076fa528fca8848cee46a06952acc4acb..a00c7e923e1aadd071b183103ee1e27806d4b3ff 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -431,7 +431,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -434,7 +434,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
int32_t world_id) override {}
void DidInstallConditionalFeatures(v8::Local<v8::Context>,
int32_t world_id) override {}
patches/chromium/chore_partial_revert_of.patch
+2 -2
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 51305f33cbde7484156e1b844be09401860e5b98..64b51da47d4efcc1c85fe77a70766d07a6f2f231 100644
index 8dd73d0447776743aff4f0e26fa5310636de7bd3..3bdc5b53366933c5946e7afac4a5400357dd60e8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5676,7 +5676,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -5677,7 +5677,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
: IsGuest();
// While some guest types do not have a guest SiteInstance, the ones that
// don't all override WebContents creation above.
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+6 -6
View File
@@ -80,10 +80,10 @@ index 39fa45f0a0f9076bd7ac0be6f455dd540a276512..3d0381d463eed73470b28085830f2a23
content::WebContents* source,
const content::OpenURLParams& params,
diff --git a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
index b7db7938af9dba708ee46fbd883b7c967d0a1204..b63b0dae79cc5839ecfcfb4ac4b9f256434cf978 100644
index 8c14dc878b81b80d97bf42d1a3615b56c7785cb0..8b3c1187c7ac5a0d1b1124efef4ecab8eec21d2a 100644
--- a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
+++ b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
@@ -998,8 +998,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
@@ -991,8 +991,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -93,7 +93,7 @@ index b7db7938af9dba708ee46fbd883b7c967d0a1204..b63b0dae79cc5839ecfcfb4ac4b9f256
if (actor::HasActorTaskPreventingNewWebContents(opener)) {
// If an ExecutionEngine is acting on the opener, prevent it from creating a
// new WebContents. We'll instead force the navigation to happen in the same
@@ -1022,7 +1021,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
@@ -1015,7 +1014,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
content::mojom::WindowContainerType::BACKGROUND &&
ShouldCreateBackgroundContents(browser_->GetProfile(),
source_site_instance, opener_url,
@@ -159,7 +159,7 @@ index 52e96d65dfc367a55815a26bd7f15beb23a8b613..b27c9a411cb76056c03635185a500723
}
content::WebContents* CreateCustomWebContents(
diff --git a/chrome/browser/ui/views/picture_in_picture/document_pip_host.cc b/chrome/browser/ui/views/picture_in_picture/document_pip_host.cc
index 39f40c132624e24c339e68c618aa27cbbabb5cf0..852b737e3a90d507a59b546160de0660e0e1a7bf 100644
index f58d00744a5efefdd8b84e034f27ac2f486bc261..5d769a43308eb3a02d22f712a47c0be93566fc2b 100644
--- a/chrome/browser/ui/views/picture_in_picture/document_pip_host.cc
+++ b/chrome/browser/ui/views/picture_in_picture/document_pip_host.cc
@@ -432,8 +432,7 @@ bool DocumentPipHost::IsWebContentsCreationOverridden(
@@ -251,10 +251,10 @@ index b969f1d97b7e3396119b579cfbe61e19ff7d2dd4..b8d6169652da28266a514938b45b39c5
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 3022edab1b696e43b2f1d0c0483b3b995a109a89..6341a5e97e639840bfe2ed778e6028aac8a8dbf4 100644
index ef5291544a95a491ff26b4ba4383d58ba799e0c4..3f6adff654507ff6fbc20e5f238268d57ad7f0a3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5640,8 +5640,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -5641,8 +5641,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ &&
delegate_->IsWebContentsCreationOverridden(
opener, source_site_instance, params.window_container_type,
patches/chromium/chore_restore_some_deprecated_wrapper_utility_in_gin.patch
+2 -2
View File
@@ -371,7 +371,7 @@ index 01d3606a5b50e3ff5b8a4869e1c0c3bd1878e495..cb175a02eb36fef484e863b1825407b0
+
} // namespace gin
diff --git a/gin/wrappable.h b/gin/wrappable.h
index d6e34c5155434e8d6330fe6a3912aaebf7c15955..9b93715ec88ebbd3dd58eb253468f5b8dd8aff51 100644
index 5ab0ea8757fed4cdd036606edaf13f16205ef253..a4b5e6c6d20279c7d3dfe83d3adf35210d4521ed 100644
--- a/gin/wrappable.h
+++ b/gin/wrappable.h
@@ -63,6 +63,9 @@ static_assert(sizeof(v8::CppHeapPointerTag) == sizeof(WrappablePointerTag),
@@ -384,7 +384,7 @@ index d6e34c5155434e8d6330fe6a3912aaebf7c15955..9b93715ec88ebbd3dd58eb253468f5b8
} // namespace internal
@@ -162,6 +165,75 @@ struct Converter<T*> {
@@ -160,6 +163,75 @@ struct Converter<T*> {
}
};
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
+3 -3
View File
@@ -7,10 +7,10 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index de3e77d563412a1d9052f3ac83de70e372c8ad36..83ebe46426c8d96188fbd6d0f3f093deea4a6587 100644
index 6f0fb21c07ce18c4185870045d007d42a1b38dff..dbe004a7ee780b5d56a72cc3a241f1e39341788d 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -269,8 +269,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
@@ -270,8 +270,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
#endif
@@ -25,7 +25,7 @@ index de3e77d563412a1d9052f3ac83de70e372c8ad36..83ebe46426c8d96188fbd6d0f3f093de
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
base::FileDescriptorStore& file_descriptor_store =
base::FileDescriptorStore::GetInstance();
@@ -1014,7 +1019,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
@@ -1016,7 +1021,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
if (delegate_->ShouldLoadV8Snapshot(process_type)) {
patches/chromium/expose_setuseragent_on_networkcontext.patch
+4 -4
View File
@@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 04b48f455f87dc1c12df4ec35231effa0b2b885b..ed2803fddefc9a4d28ae861664e6817f209453cf 100644
index 5f39008fba5d457cfcb9690ae381c61b00607b3a..293a16f72777965eb5718e0229d1caa3d882866c 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -2080,6 +2080,13 @@ void NetworkContext::SetNetworkConditions(
@@ -51,7 +51,7 @@ index 04b48f455f87dc1c12df4ec35231effa0b2b885b..ed2803fddefc9a4d28ae861664e6817f
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 3677e8584f62b2bbd44ab2d3b948a9d1a6cbfc9f..49794ca980c739ca07b82c6578c1887f2c90d502 100644
index 51d94c9b0d08d986ae793ce702ee94d8366452bb..6c4c47309f56986d0f5f8603da5454174a5f1a7c 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -358,6 +358,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -63,7 +63,7 @@ index 3677e8584f62b2bbd44ab2d3b948a9d1a6cbfc9f..49794ca980c739ca07b82c6578c1887f
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CT_SUPPORTED)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 1f045a9713bbd90b3f08c6889a4d1225459da91c..df1d7e9a4810cb15da4374616b3f259364223d77 100644
index b9c65d72932777d5b91d15d2ab11d44db102473e..4a54145b491b34097f331a591f816552a0dc45e9 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1400,6 +1400,9 @@ interface NetworkContext {
@@ -77,7 +77,7 @@ index 1f045a9713bbd90b3f08c6889a4d1225459da91c..df1d7e9a4810cb15da4374616b3f2593
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index c18d22f080115fb9769270b06c8ecd913adc8842..eb03176548d6aef070ebdcd0afe20aa4fcf3a80b 100644
index 1de838388236275f93bb05306065789d8380a437..3e13e542ed7dd0f73a54363faa867a5b3712ccb9 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -169,6 +169,7 @@ class TestNetworkContext : public mojom::NetworkContext {
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+6 -6
View File
@@ -13,7 +13,7 @@ uses internally for things like menus and devtools.
We can remove this patch once it has in some shape been upstreamed.
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
index f3c3f48681854900e8de6af4f344fe35fa1a64c8..44ac07723692f1f4aec1f8fa3ea1dc1dc4b95a85 100644
index e131113a7d5eeea02929ff037d898f1c2f281a43..1c5bc9402b148916353216d76dfbd68b9acb5c5d 100644
--- a/ui/native_theme/native_theme.h
+++ b/ui/native_theme/native_theme.h
@@ -505,6 +505,8 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
@@ -25,9 +25,9 @@ index f3c3f48681854900e8de6af4f344fe35fa1a64c8..44ac07723692f1f4aec1f8fa3ea1dc1d
return preferred_color_scheme_;
}
void set_preferred_color_scheme(PreferredColorScheme preferred_color_scheme) {
@@ -536,6 +538,24 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
caret_blink_interval_ = caret_blink_interval;
}
@@ -539,6 +541,24 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
size_t system_color_version() const { return system_color_version_; }
void IncrementSystemColorVersion() { ++system_color_version_; }
+ enum ThemeSource {
+ kSystem,
@@ -50,10 +50,10 @@ index f3c3f48681854900e8de6af4f344fe35fa1a64c8..44ac07723692f1f4aec1f8fa3ea1dc1d
protected:
explicit NativeTheme(SystemTheme system_theme = SystemTheme::kDefault);
virtual ~NativeTheme();
@@ -615,6 +635,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
ColorProviderKey::UserColorSource preferred_color_source_ =
@@ -619,6 +639,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme {
ColorProviderKey::UserColorSource::kAccent;
base::TimeDelta caret_blink_interval_;
size_t system_color_version_ = 0;
+ ThemeSource theme_source_ = ThemeSource::kSystem;
raw_ptr<NativeTheme> associated_web_instance_ = nullptr;
patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
+3 -3
View File
@@ -20,7 +20,7 @@ index 120590a93bbc5a47e73c5d5515b7ad07b2364eb6..50a8b0dfe5400d1ab9da2893088583e4
requested_format_.pixel_format = media::PIXEL_FORMAT_NV12;
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
index 28393355d80c3cc25014fec1615b0c2e057ddce7..813c6cd4e99c38f9a840fd6c659cc262ce7c8211 100644
index f5be4eb6cb660ad87253846e84ceb8628a907330..bb44271de5d43d34374056ac6d20808e8be6fef2 100644
--- a/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(
@@ -33,7 +33,7 @@ index 28393355d80c3cc25014fec1615b0c2e057ddce7..813c6cd4e99c38f9a840fd6c659cc262
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
index e2771b7b281274cdcb601a5bc78a948ad592087b..48d116823a28213e50775f378e6ce04ce3af5072 100644
index 6d54c2bc01f32a0d987aadb8eb0684d0ec0444d4..40f64c7705427bbe3fa4e3c0565196766b758ce9 100644
--- a/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
@@ -326,7 +326,7 @@ index 4df67f6a7cb9d044d5865f53551471a53077a5eb..cd61d54472317b435b24c3638a8b3981
// Although ScreenCaptureKit is available in 12.3 there were some bugs that
diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
index ae8fef5b0b3557480771783dabcc6dfa57deefeb..b7fbac21200c5d9120a28b7353a6c23381b91793 100644
index 2b7decc56a4d72d7ef8af48056e08e4d562fddec..d8e23dbfe620304c2c4aa50622033823c080ef2d 100644
--- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
+++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
@@ -322,8 +322,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(
patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch
+6 -6
View File
@@ -26,10 +26,10 @@ hook called before the new RenderFrame is created so it can be picked up
by RenderFrameCreated() on the same call stack.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index bf65e1803e32af0b683da63eaab06044df5faacf..c2911e42d8d2ca7fc98ab1afdf2e6b4f170c4d0b 100644
index 8b784147d4320c45d03f111907886b6e2deafd1b..a890bdbdf46c6583f044a15cda527af961d2a46a 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10823,7 +10823,12 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10835,7 +10835,12 @@ void RenderFrameHostImpl::CreateNewWindow(
new_main_rfh->GetSiteInstance()->browsing_instance_token(),
delegate_->GetColorProviderColorMaps(),
/*widget_screen_rect=*/std::nullopt,
@@ -89,7 +89,7 @@ index 988d83fdf70abec970f96188d3cb755ab885193f..1af71f5258dd95c2f51d51f52a1b7939
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index a4e03cb95c0dc0bafecd402251e9f52490538957..8345356f57cedad95d8b1aa4471068de4f67f990 100644
index 9ed4e7934b3fdf3cc2f27d29cc799c07050cded4..a11c741da924d7b4bea632865dad89fa805cbd77 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -61,6 +61,7 @@
@@ -100,7 +100,7 @@ index a4e03cb95c0dc0bafecd402251e9f52490538957..8345356f57cedad95d8b1aa4471068de
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/message_pipe.h"
@@ -1281,6 +1282,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1283,6 +1284,17 @@ class CONTENT_EXPORT ContentBrowserClient {
bool opener_suppressed,
bool* no_javascript_access);
@@ -148,10 +148,10 @@ index 51d460f9982489575e94ad3726a44f77800a44ba..84fb8167a48f033fd941cfcb6feabbc3
// `outermost_origin` is only set if it is an extension scheme, otherwise
// it will be null. It is null to avoid leaking unnecessary information into
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 751f651fafe5de0ccbee442f76ee9dc42e087e30..e4536360abf01b7df54f25b64ec497d6a1511027 100644
index 540aa229335c567fc4fe2c2776899199c8a0e761..503b81896ed65fa312071a49d1c26ed1e8cdc8f5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -7206,6 +7206,14 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -7207,6 +7207,14 @@ WebView* RenderFrameImpl::CreateNewWindow(
return nullptr;
}
patches/chromium/feat_configure_launch_options_for_service_process.patch
+1 -1
View File
@@ -746,7 +746,7 @@ index 421e7f2baa1ca05ac3db1a2499273de740a98724..10751e2aabadd53b2213178d65357fac
// An interface which can be implemented and used with
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index f2a826791ff321a68c02cef923fefb1283e246fc..daeb9327d28fab06bcb1375606e18419063850d6 100644
index 0bcb43d58cfc3ae867824264766ecdd1b0f99360..6cad7a39333415d3fb1aed559b108a222466e6bf 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -631,11 +631,9 @@ base::win::ScopedHandle CreateUnsandboxedJob() {
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
+8 -8
View File
@@ -46,10 +46,10 @@ index 1c01e4d6699da8760e074a5825784e139ed58fd4..c678a3df0b9e5a8c9e0bd99c1aa540b2
'internal-forced-visited-'):
internal_visited_order = 0
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
index 8b836b1f586e4c444976d68ea9918b7add15e6bb..a964c3e8c80fe652358b20502b537b4f2037ce33 100644
index 358aa3e48092530dc70d054c738ba36d154de316..bdcaad3bae3123f9318d7b9c2ca7f837bba19be8 100644
--- a/third_party/blink/renderer/core/css/css_properties.json5
+++ b/third_party/blink/renderer/core/css/css_properties.json5
@@ -10300,6 +10300,27 @@
@@ -10299,6 +10299,27 @@
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
},
@@ -91,10 +91,10 @@ index d9983abcd27cb91c62c1a45689813bd01328b245..8bd8885d7d9c59d4059a3c33b6d3d6df
return a.EmptyCells() == b.EmptyCells();
case CSSPropertyID::kFill:
diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
index 80ce0cb2575100175ebc9b4bfd31f6561fe1e6ae..45cc1e9524f00806f1fa44bbc6c57b271f486f33 100644
index 6c141550b40e2879a8c01ef590ddefcfea0a28fd..80e1937d46ce1011d25f97dbd8088ef2327a9652 100644
--- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
+++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
@@ -12788,5 +12788,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
@@ -12787,5 +12787,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
CSSValueID::kNone>(stream);
}
@@ -132,10 +132,10 @@ index 80ce0cb2575100175ebc9b4bfd31f6561fe1e6ae..45cc1e9524f00806f1fa44bbc6c57b27
} // namespace css_longhand
} // namespace blink
diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
index 6acdae63ef23c9b1faea35b0ac4ba118704b8d18..7794bdd2f3466a09038ef0b3703b438ea575531d 100644
index 5ce330adf9c576bf2ece98ff7a0964abf1685ed0..db372f47d321341291be583fde04d593b5e57bbd 100644
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
@@ -4241,6 +4241,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
@@ -4235,6 +4235,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
return PositionTryFallback(scoped_name, tactic_list);
}
@@ -152,7 +152,7 @@ index 6acdae63ef23c9b1faea35b0ac4ba118704b8d18..7794bdd2f3466a09038ef0b3703b438e
const CSSValue& value) {
const auto& list = To<CSSValueList>(value);
diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
index b84001ffee926adb9a6e09447d7ddfad45465973..5a2aff4dddab3153b83799467693fa902c3918c7 100644
index fa5c8716759cc482f6d68ba90a5fadbb51a1bb46..0f02a1cc9c5cbed510fd2ce8335cda7b4fa58dfa 100644
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
@@ -470,6 +470,7 @@ class StyleBuilderConverter {
@@ -314,7 +314,7 @@ index 398fc8badaaf1dddc3183211c9302460393da85f..b35c8261b27a2d5c5f6bd84b606925c9
auto DrawAsSinglePath = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index ce4a2bcb322755dc8fb59d60b09df393af6ff9c0..f2ba4a559b9838cc744e5d67bc0bec52e0fbb553 100644
index ec3bed45d1a5768cda6f52ddb30025d024e8dade..d16a128464b6b22599c930930be4240b58296bec 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -215,6 +215,10 @@
patches/chromium/feat_deliver_service_worker_preload_data_via_embeddedworkerstartparams.patch
+2 -2
View File
@@ -51,10 +51,10 @@ index 1af71f5258dd95c2f51d51f52a1b7939baf70966..848e82817074353f81968be66dd4c3e4
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 8345356f57cedad95d8b1aa4471068de4f67f990..a70317f0a40ccc8e07b82e43330a70d574b226c0 100644
index a11c741da924d7b4bea632865dad89fa805cbd77..ed4c510482664b462d60057746e594c56c657285 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1293,6 +1293,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1295,6 +1295,17 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* new_window_main_frame,
const GURL& target_url);
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
+2 -2
View File
@@ -28,10 +28,10 @@ The patch should be removed in favor of either:
Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index d0cce51f7903262676279442a69addcea60dc0f5..8600e89ffd8aa012117192bec10a1406657392b9 100644
index cee72b6123a1eea96dd3f000a0966d19454722ae..064404c1067489b57a144e0c5ad0be762b89369c 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -12558,6 +12558,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
@@ -12639,6 +12639,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
target_rph_id);
}
patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch
+3 -3
View File
@@ -162,10 +162,10 @@ index f4ebbefe2590a610e3c505dfc78ce0c409731d40..fbaf1fd9431c1acb41320fa620bd6e92
// The display of the opener window, cached during
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index 5d375de1cdf8fa5a6a003a72c32e5b6c54f2a861..3dfe703403de9a35efa3eeeb5ef53559457fa523 100644
index 1f59e4933b10067a7c7ad73339d9bbbea4f3217c..17e13398846104b80fac2f0cda9cd7f6b0753da0 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -114,8 +114,10 @@ constexpr gfx::Size kMinWindowSize(284, 160);
@@ -115,8 +115,10 @@ constexpr gfx::Size kMinWindowSize(284, 160);
constexpr int kOverlayBorderThickness = 10;
@@ -176,7 +176,7 @@ index 5d375de1cdf8fa5a6a003a72c32e5b6c54f2a861..3dfe703403de9a35efa3eeeb5ef53559
// Size for action buttons.
constexpr gfx::Size kActionButtonSize(28, 28);
@@ -415,11 +417,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
@@ -416,11 +418,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
#endif // BUILDFLAG(IS_WIN)
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
+5 -5
View File
@@ -39,10 +39,10 @@ index 1f743053f8ca891d820f4dd1c4d93d84c2c4769c..aaabb5f1308a19d35fad27aa3be10cff
// Detaches |this| from the input method object.
// is_removed flag is true if this is called while the window is
diff --git a/content/browser/renderer_host/text_input_manager.cc b/content/browser/renderer_host/text_input_manager.cc
index c1100b4f152202e95552d929f4cafcf3487da0fd..0af1be25982f4a87b1509e166b87b13ca23ba1d5 100644
index 90f7ffa6e410269192f4e6c8780fb8750b25ec77..d51278d25750349ce68c1ce3a479fb145bb962ce 100644
--- a/content/browser/renderer_host/text_input_manager.cc
+++ b/content/browser/renderer_host/text_input_manager.cc
@@ -231,6 +231,7 @@ void TextInputManager::UpdateTextInputState(
@@ -233,6 +233,7 @@ void TextInputManager::UpdateTextInputState(
if (text_input_state.type == ui::TEXT_INPUT_TYPE_NONE &&
active_view_ != view) {
@@ -50,7 +50,7 @@ index c1100b4f152202e95552d929f4cafcf3487da0fd..0af1be25982f4a87b1509e166b87b13c
// We reached here because an IPC is received to reset the TextInputState
// for |view|. But |view| != |active_view_|, which suggests that at least
// one other view has become active and we have received the corresponding
@@ -534,6 +535,12 @@ void TextInputManager::NotifyObserversAboutInputStateUpdate(
@@ -536,6 +537,12 @@ void TextInputManager::NotifyObserversAboutInputStateUpdate(
observer.OnUpdateTextInputStateCalled(this, updated_view, did_update_state);
}
@@ -87,10 +87,10 @@ index 6e07e5ef9d033aa6ac98e3f48966b560b0da115e..ee72a9bf160c10011a2d80f4023d1434
// 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 ae1d1021c5d5ded752fa01b0851a5bb9251fe2be..51305f33cbde7484156e1b844be09401860e5b98 100644
index 241e5ca73a1973ffd962d07f2d27b4771cbf2485..8dd73d0447776743aff4f0e26fa5310636de7bd3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -11071,7 +11071,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -11072,7 +11072,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
return;
}
RenderWidgetHostViewBase* root_view =
patches/chromium/fix_register_the_spare_renderer_before_initializing_it.patch
+1 -1
View File
@@ -15,7 +15,7 @@ Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/8283216;
remove once it lands and rolls in.
diff --git a/content/browser/renderer_host/spare_render_process_host_manager_impl.cc b/content/browser/renderer_host/spare_render_process_host_manager_impl.cc
index 6895fdd5d7f8b165f4a0ab603b14400b87a5c24d..81b0abeb04d2497e468fa2b92b6c2d69b234ac49 100644
index bda3feda2c6496ae1e4d03b31dd174764a1214c3..6c5e743478a3898251080142225dd6354b92fd63 100644
--- a/content/browser/renderer_host/spare_render_process_host_manager_impl.cc
+++ b/content/browser/renderer_host/spare_render_process_host_manager_impl.cc
@@ -558,8 +558,8 @@ RenderProcessHost* SpareRenderProcessHostManagerImpl::WarmupSpare(
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
+1 -1
View File
@@ -210,7 +210,7 @@ index 6d4a2d197c2341853956339f2690f885827a7356..aae5d5a61b3da2b5caf1b29eef8c12f8
const mojom::blink::UserActivationOption user_activation_option_;
const mojom::blink::LoadEventBlockingOption blocking_option_;
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
index 80148079507dd074a92326af7ce0ca17dee20f8c..28bf65314d7aaaa5db736b69ebe8c323b221ddbe 100644
index 2fc6be7b6bbbeaa654e334daeba14a87728320fa..a369140404dbbab877d2d847f247493dfcc08bf2 100644
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -308,6 +308,7 @@ void ExecuteScriptsInMainWorld(
patches/chromium/fix_use_delegated_generic_capturer_when_available.patch
+3 -3
View File
@@ -15,10 +15,10 @@ capturer was window or screen-specific, as the IDs remain valid for
generic capturer as well.
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index eac19bad1f321f9a1511e251ad627dd45766b7ef..0a7e37af809ad33090abf47e0738ec238a5fb350 100644
index a6ff5af518d15cb8e86471e41edd18383a78755a..608fd3a2323c5acce47070dd9d9649ecdfaec2ae 100644
--- a/content/browser/media/capture/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -1402,9 +1402,16 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
@@ -1412,9 +1412,16 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
switch (source.type) {
case DesktopMediaID::TYPE_SCREEN: {
@@ -38,7 +38,7 @@ index eac19bad1f321f9a1511e251ad627dd45766b7ef..0a7e37af809ad33090abf47e0738ec23
if (screen_capturer && screen_capturer->SelectSource(source.id)) {
capturer = std::make_unique<webrtc::DesktopAndCursorComposer>(
std::move(screen_capturer), options);
@@ -1421,8 +1428,15 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
@@ -1431,8 +1438,15 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
}
case DesktopMediaID::TYPE_WINDOW: {
patches/chromium/frame_host_manager.patch
+2 -2
View File
@@ -6,7 +6,7 @@ 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 ca23076b88c37b58ad16a3382448335d7c32b638..4e9115e2c5cdbe59876017acae02435ed00f1270 100644
index dab87ad0f62eeea5786335010f6c2f31e8606001..c0b016e7719cc18bf4c29bf1e4c8dc210a5cb24b 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -5044,6 +5044,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -20,7 +20,7 @@ index ca23076b88c37b58ad16a3382448335d7c32b638..4e9115e2c5cdbe59876017acae02435e
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 8bb776827d657496abec10c2bef1b7682f9af10c..a4e03cb95c0dc0bafecd402251e9f52490538957 100644
index 19e2f07459a67f59d4a7a51d588750e96736a842..9ed4e7934b3fdf3cc2f27d29cc799c07050cded4 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -350,6 +350,11 @@ class CONTENT_EXPORT ContentBrowserClient {
patches/chromium/gritsettings_resource_ids.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 9f87211bda65feb8b38cf3db2b0a83726d6810ab..0122a3142faf41c8fd33c1b55623d80a5906cbde 100644
index b5503c48ce1c47bbc43e37e3872d8dedf9701003..ba7c98655370a6151a9530eba4c3ad3364364011 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1800,6 +1800,11 @@
@@ -1804,6 +1804,11 @@
"includes": [12000],
},
patches/chromium/gtk_visibility.patch
+1 -1
View File
@@ -18,7 +18,7 @@ index cf4ba33f126de22443707f849f0c330cd78a0fbe..53104ee0b040653f6baa66c75d5df34e
# on GTK.
"//examples:peerconnection_client",
diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
index de7c3330d47d36c202e387830d2100d6e6366cc9..e23ffc69906c490c2450d34ebb96b1047ec5eb57 100644
index 7998b35afbb9741b078a9f669e0c476ce78409d8..c40594e11b8dfe149994810e72fd27330707e882 100644
--- a/ui/ozone/platform/x11/BUILD.gn
+++ b/ui/ozone/platform/x11/BUILD.gn
@@ -5,7 +5,7 @@
patches/chromium/make_gtk_getlibgtk_public.patch
+1 -1
View File
@@ -39,7 +39,7 @@ index e05b4f2eb1b22d5a647cb020bae4e4052a2e735c..86524a419606bea3e7d090415fda8f2d
static bool loaded = LoadGtkImpl(backend);
return loaded;
diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
index e427a9f7c89d2287009356372acb83d450e817b9..03bb11d6108d350f2416af3a2c95ec714714228b 100644
index 8f3928a9b8494c08d9573fed5f8f11842b49ad7d..d686117f1b1d64e09f73454321a24883a9816a17 100644
--- a/ui/gtk/gtk_compat.h
+++ b/ui/gtk/gtk_compat.h
@@ -43,6 +43,12 @@ using SkColor = uint32_t;
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
+12 -12
View File
@@ -50,7 +50,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 809757ba0d27993e347006274faa21e22cec0363..a47655de11c5fe58c3a729022985a9aea1749c6a 100644
index 86038de345c8ef3489f9a4805e87bd7591a4d509..03c0f593b4221f95bf02e8075ad69089441619d8 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1152,6 +1152,7 @@ component("base") {
@@ -129,10 +129,10 @@ index 416e541436d201aabca26cdbf7e8477103bd014c..8c5f92b03d67e5f0587b0e9420969061
}
diff --git a/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn b/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
index d1c0aa669524420b05ab9f379cd93bd9e26d3cf6..f0fa949bae83ccb45ced180b4143246642afc09d 100644
index 9cc2a8a8e055fb90017c4f67a54bb8e20378d404..3b8c31d4b9b3e067b227458aa58541146e0768b5 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
+++ b/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -1041,6 +1041,7 @@ if (is_clang_or_gcc) {
@@ -1040,6 +1040,7 @@ if (is_clang_or_gcc) {
":allocator_base",
":allocator_core",
":buildflags",
@@ -991,7 +991,7 @@ index 1f4f52db2cc37fd7383c432e09212e27df708732..ed4c62b6462684a79de8b69823f52ed7
return kAttributes;
}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index e7e168a10b7b9051b74d0964b1b51fe96b10f142..792bdc0566e1e492ca30a4f4e78bc406de1df544 100644
index 76a97af0f62e4bce4987b3ea91b14265e69eaaa9..2c28176e2f428b92a085ff0b2e0e4d498bd85302 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -381,6 +381,7 @@ source_set("browser") {
@@ -1124,10 +1124,10 @@ index 7af4d8bb3493245297407f662b130e8f581aa14b..2f424ceaae13b01dce075d227b3e68db
defines = []
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 5a4051158ce35d281eeaff71f3505321925b73ac..1c8e7aa5ac69c274076d551b065bf94cac243a1c 100644
index 9e7c9d9aa5cf5c170dbd6ad8cbe7d20ff2b249d9..97e2a8eecd59caa45c7902f292d08f32ae716499 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -322,6 +322,7 @@ target(link_target_type, "renderer") {
@@ -323,6 +323,7 @@ target(link_target_type, "renderer") {
"//ui/strings:auto_image_annotation_strings_grit",
"//url",
"//v8",
@@ -1206,7 +1206,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index a85404f6d12759a95672f09e3a7e8c1098c0bcfc..821bdf298c88e842985f9ed567205b827df435a5 100644
index 63067b596bd6aafc68199207f8f3711f004c537e..817b295c0d06edf6046b15b49d47049ea32566c8 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -651,6 +651,7 @@ static_library("test_support") {
@@ -1226,7 +1226,7 @@ index a85404f6d12759a95672f09e3a7e8c1098c0bcfc..821bdf298c88e842985f9ed567205b82
}
mojom("content_test_mojo_bindings") {
@@ -2031,6 +2034,7 @@ test("content_browsertests") {
@@ -2028,6 +2031,7 @@ test("content_browsertests") {
"//ui/shell_dialogs",
"//ui/snapshot",
"//ui/webui:test_support",
@@ -1234,7 +1234,7 @@ index a85404f6d12759a95672f09e3a7e8c1098c0bcfc..821bdf298c88e842985f9ed567205b82
]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3351,6 +3355,7 @@ test("content_unittests") {
@@ -3349,6 +3353,7 @@ test("content_unittests") {
"//ui/shell_dialogs",
"//ui/webui:test_support",
"//url",
@@ -2309,7 +2309,7 @@ index cf4c30f417f9a7689f02ceec3b9326e9ca9989b7..ed8059a069757b5d0ce4fd8b0925e89d
deps += [ "//build:ios_buildflags" ]
}
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
index ea56d1861d2bcf4d4514b5136d7a0fd0a2f121b2..9121fc1f13219f2c1ee58f1806cedb7c6a83edb0 100644
index b9e05b289bbb5c97da3169d23e0c83c240cedaa2..17c04a307be0b6f957770083b13f30bc9d246b8b 100644
--- a/ui/display/mac/screen_mac.mm
+++ b/ui/display/mac/screen_mac.mm
@@ -29,6 +29,7 @@
@@ -2320,7 +2320,7 @@ index ea56d1861d2bcf4d4514b5136d7a0fd0a2f121b2..9121fc1f13219f2c1ee58f1806cedb7c
#include "ui/display/display.h"
#include "ui/display/display_change_notifier.h"
#include "ui/display/mac/screen_mac_headless.h"
@@ -179,7 +180,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
@@ -181,7 +182,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
display.set_color_depth(Display::kDefaultBitsPerPixel);
display.set_depth_per_component(Display::kDefaultBitsPerComponent);
}
@@ -2390,7 +2390,7 @@ index 65ae8170664d15c7884261812400d0ed638a681d..86c937f1e6d03b88803a2ca80abff19c
// enough.
return PlatformFontMac::SystemFontType::kGeneral;
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index ff6a3c14044d497c1617fd377598ac00fdcf0ba7..2a483479f92fa456d4abb6e15475206e18683110 100644
index e35d5f0401f4478a6a3d7d67294e218ca3c76dc1..5171d302433932006c201ddde9b0c31a75d1d1f9 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -793,6 +793,8 @@ component("views") {
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+4 -4
View File
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 146ebc1dd784b63164d86952e410700dc7bfaa32..04b48f455f87dc1c12df4ec35231effa0b2b885b 100644
index 9137af1094f70e800f4bdfe42d6e8e0ac9e3e1f5..5f39008fba5d457cfcb9690ae381c61b00607b3a 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -187,6 +187,11 @@
@@ -159,7 +159,7 @@ index 146ebc1dd784b63164d86952e410700dc7bfaa32..04b48f455f87dc1c12df4ec35231effa
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 769f8319cf211ff01e16247cee76794de99c8511..3677e8584f62b2bbd44ab2d3b948a9d1a6cbfc9f 100644
index a9882bb64a2134d927ce50534f016ddaad91b4dd..51d94c9b0d08d986ae793ce702ee94d8366452bb 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -130,6 +130,7 @@ class SimpleUrlPatternMatcher;
@@ -189,7 +189,7 @@ index 769f8319cf211ff01e16247cee76794de99c8511..3677e8584f62b2bbd44ab2d3b948a9d1
std::unique_ptr<HostResolver> internal_host_resolver_;
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
index 7ee6579abfd1d1737ccf84e3405cd2b5fa4621f6..1f045a9713bbd90b3f08c6889a4d1225459da91c 100644
index b085fd3a05f74bfbf062d78b845b3fbe9322cc8f..b9c65d72932777d5b91d15d2ab11d44db102473e 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -347,6 +347,17 @@ struct SocketBrokerRemotes {
@@ -220,7 +220,7 @@ index 7ee6579abfd1d1737ccf84e3405cd2b5fa4621f6..1f045a9713bbd90b3f08c6889a4d1225
CreateURLLoaderFactory(
pending_receiver<URLLoaderFactory> url_loader_factory,
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index ded455fafc11413d1b933c8c53ade86c2a7bb156..c18d22f080115fb9769270b06c8ecd913adc8842 100644
index bfb23a34ad59787d080391a2cfe24b3062f3cb16..1de838388236275f93bb05306065789d8380a437 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -67,6 +67,8 @@ class TestNetworkContext : public mojom::NetworkContext {
patches/chromium/notification_provenance.patch
+5 -5
View File
@@ -7,10 +7,10 @@ Pass RenderFrameHost through to PlatformNotificationService
so Electron can identify which renderer a notification came from.
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index 3b7a3c7f5253523681481404b067c37ef9d6ac97..8cd44538b414c9191b0570422235187bf33e776c 100644
index 983dbffb4dc1ea26714de2f1fa958b5e741974ca..348a87e9c20266d78f3894e492781fb48c208759 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -265,6 +265,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
@@ -256,6 +256,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
// TODO(awdf): Rename to DisplayNonPersistentNotification (Similar for Close)
void PlatformNotificationServiceImpl::DisplayNotification(
@@ -133,10 +133,10 @@ index 9bf238e64af483294ae3c3f18a4e9aed49a8658d..b9b2a4c8c387b8e8b4eb1f02fc0f891c
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 2fc340328f54a1491b56eb6c611148dcfe0e7c11..19c2c049e1a29d66cbfbd93420d198842df68bcf 100644
index 92da3f57765515d5bdf23f661d3520ceaa3aeb5c..61fff829690113a495e9220bac890664b73ce3a2 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2500,7 +2500,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2503,7 +2503,7 @@ void RenderProcessHostImpl::CreateNotificationService(
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -145,7 +145,7 @@ index 2fc340328f54a1491b56eb6c611148dcfe0e7c11..19c2c049e1a29d66cbfbd93420d19884
creator_type, std::move(receiver));
break;
}
@@ -2508,7 +2508,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2511,7 +2511,7 @@ void RenderProcessHostImpl::CreateNotificationService(
CHECK(rfh);
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
patches/chromium/picture-in-picture.patch
+6 -5
View File
@@ -46,10 +46,10 @@ index ffaf5f5f5f68ab6811c115ef66c8eb8f7f370027..6a43f6b515aacac600e3928a33bda6ed
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
kCloseButtonIconSize));
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c54f2a861 100644
index 0fbb40d24f2ce7bec54e87a2223bd78c580d9058..1f59e4933b10067a7c7ad73339d9bbbea4f3217c 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -18,13 +18,17 @@
@@ -18,14 +18,18 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "build/build_config.h"
@@ -58,6 +58,7 @@ index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c
+#endif
#include "chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h"
#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
#include "chrome/browser/picture_in_picture/video_overlay_window.h"
+#if 0
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_init_state.h"
@@ -67,7 +68,7 @@ index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c
#include "chrome/browser/ui/color/chrome_color_id.h"
#include "chrome/browser/ui/views/overlay/back_to_tab_button.h"
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
@@ -33,8 +37,10 @@
@@ -34,8 +38,10 @@
#include "chrome/browser/ui/views/overlay/hang_up_button.h"
#include "chrome/browser/ui/views/overlay/minimize_button.h"
#include "chrome/browser/ui/views/overlay/overlay_controls_fade_animation.h"
@@ -78,7 +79,7 @@ index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c
#include "chrome/browser/ui/views/overlay/playback_image_button.h"
#include "chrome/browser/ui/views/overlay/resize_handle_button.h"
#include "chrome/browser/ui/views/overlay/simple_overlay_window_image_button.h"
@@ -86,7 +92,7 @@
@@ -87,7 +93,7 @@
#include "ui/aura/window.h"
#endif
@@ -87,7 +88,7 @@ index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c
#include "chrome/browser/shell_integration_win.h"
#include "content/public/browser/render_widget_host_view.h"
#include "ui/aura/window.h"
@@ -368,7 +374,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
@@ -369,7 +375,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
overlay_window->Init(std::move(params));
overlay_window->OnRootViewReady();
patches/chromium/printing.patch
+3 -3
View File
@@ -607,10 +607,10 @@ index eeb4f72448319d0c8a498cc41ea7b17289a60424..c4fb52c4c5b99c6c603f6da5c188f963
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/printing/printer_query_oop.cc b/chrome/browser/printing/printer_query_oop.cc
index 1e160aab45a5beccd1c25e8dcb23e1cd021b5231..5111a41714401c5e7231e531005b7e4032c26708 100644
index 21ea23304b7b4652c93a9dd2de1b4bbca83a32c8..49efb2d2b621063ed94d6d17fa563f341495f965 100644
--- a/chrome/browser/printing/printer_query_oop.cc
+++ b/chrome/browser/printing/printer_query_oop.cc
@@ -126,7 +126,7 @@ void PrinterQueryOop::OnDidAskUserForSettings(
@@ -127,7 +127,7 @@ void PrinterQueryOop::OnDidAskUserForSettings(
std::unique_ptr<PrintSettings> new_settings,
mojom::ResultCode result) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -619,7 +619,7 @@ index 1e160aab45a5beccd1c25e8dcb23e1cd021b5231..5111a41714401c5e7231e531005b7e40
// Want the same PrintBackend service as the query so that we use the same
// device context.
print_document_client_id_ =
@@ -189,6 +189,28 @@ void PrinterQueryOop::GetSettingsWithUI(uint32_t document_page_count,
@@ -190,6 +190,28 @@ void PrinterQueryOop::GetSettingsWithUI(uint32_t document_page_count,
// browser process.
// - Other platforms don't have a system print UI or do not use OOP
// printing, so this does not matter.
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+4 -4
View File
@@ -44,10 +44,10 @@ index cf8303ce26b968d247c5f0b41b87e24e389b93ae..94a3ee40f5594ce2aebe6aed5a1e4794
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 94bbc849d8b3e7e513af3b3250d8fbe46c1ec69b..3022edab1b696e43b2f1d0c0483b3b995a109a89 100644
index 983513eea85af542a8f7074a2c8280aebddf670d..ef5291544a95a491ff26b4ba4383d58ba799e0c4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -6583,6 +6583,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -6584,6 +6584,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@@ -60,10 +60,10 @@ index 94bbc849d8b3e7e513af3b3250d8fbe46c1ec69b..3022edab1b696e43b2f1d0c0483b3b99
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 87572971787229aaef046b084baf9207f0404e82..c008026637dbd1e95d013109ef7b1099d6d94f7c 100644
index 6264cfdf93993165bebe93cc3fbc967baa785bd8..34367a786ab91dfcda6e8252d708e961d926b4fc 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1252,6 +1252,7 @@ class CONTENT_EXPORT WebContentsImpl
@@ -1253,6 +1253,7 @@ class CONTENT_EXPORT WebContentsImpl
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;
patches/chromium/refactor_expose_hostimportmoduledynamically_and.patch
+7 -7
View File
@@ -7,10 +7,10 @@ Subject: refactor: expose HostImportModuleDynamically and
This is so that Electron can blend Blink's and Node's implementations of these isolate handlers.
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b444f60961 100644
index bffc0549673474d34d71c585c41f360aadd89c95..77effce341e92c0299606fa4543d082252ba8022 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -741,8 +741,9 @@ bool WasmCustomDescriptorsEnabledCallback(v8::Local<v8::Context> context) {
@@ -736,8 +736,9 @@ bool WasmCustomDescriptorsEnabledCallback(v8::Local<v8::Context> context) {
return RuntimeEnabledFeatures::WebAssemblyCustomDescriptorsV2Enabled(
execution_context);
}
@@ -21,7 +21,7 @@ index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b4
v8::Local<v8::Context> context,
v8::Local<v8::Data> v8_host_defined_options,
v8::Local<v8::Value> v8_referrer_resource_url,
@@ -820,20 +821,23 @@ v8::MaybeLocal<v8::Promise> HostImportModuleWithPhaseDynamically(
@@ -815,20 +816,23 @@ v8::MaybeLocal<v8::Promise> HostImportModuleWithPhaseDynamically(
return resolver->Promise().V8Promise();
}
@@ -47,7 +47,7 @@ index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b4
v8::Local<v8::Module> module,
v8::Local<v8::Object> meta) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
@@ -860,6 +864,7 @@ void HostGetImportMetaProperties(v8::Local<v8::Context> context,
@@ -855,6 +859,7 @@ void HostGetImportMetaProperties(v8::Local<v8::Context> context,
meta->CreateDataProperty(context, resolve_key, resolve_value).ToChecked();
}
@@ -55,7 +55,7 @@ index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b4
bool IsDOMExceptionWrapper(v8::Isolate* isolate, v8::Local<v8::Object> object) {
return V8DOMException::HasInstance(isolate, object);
}
@@ -904,7 +909,6 @@ int64_t CoarseTemporalHostSystemUTCEpochNanosecondsCallback(
@@ -899,7 +904,6 @@ int64_t CoarseTemporalHostSystemUTCEpochNanosecondsCallback(
} // namespace
@@ -63,7 +63,7 @@ index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b4
void V8Initializer::InitializeV8Common(v8::Isolate* isolate) {
// Set up garbage collection before setting up anything else as V8 may trigger
// GCs during Blink setup.
@@ -920,9 +924,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) {
@@ -915,9 +919,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) {
SharedArrayBufferConstructorEnabledCallback);
isolate->SetHostImportModuleDynamicallyCallback(HostImportModuleDynamically);
isolate->SetHostImportModuleWithPhaseDynamicallyCallback(
@@ -76,7 +76,7 @@ index a3cbee6e96dfc0805c17a1561ec8c354498a52cb..4833d04590c2769803be915c614e75b4
isolate->SetMetricsRecorder(std::make_shared<V8MetricsRecorder>(isolate));
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
index 91110ba0d658ef00ff0570a17ea1b59c33a79376..03367f157704ea87c00c1c894d93effa8fb96b55 100644
index 7a8562075e749c0c22da258d9131a77251fe54ea..f40c04628b07672d14e471ab98727fc4bd1d2fe2 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
@@ -88,6 +88,18 @@ class CORE_EXPORT V8Initializer {
patches/chromium/refactor_unfilter_unresponsive_events.patch
+2 -2
View File
@@ -15,10 +15,10 @@ 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.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 64b51da47d4efcc1c85fe77a70766d07a6f2f231..f59a2adeba9188ccd4673476eb980eabccb0d229 100644
index 3bdc5b53366933c5946e7afac4a5400357dd60e8..d2bfb959e7a671372ecc3329624b1c1c63dfecec 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -11226,25 +11226,13 @@ void WebContentsImpl::RendererUnresponsive(
@@ -11227,25 +11227,13 @@ void WebContentsImpl::RendererUnresponsive(
base::RepeatingClosure hang_monitor_restarter) {
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive",
"render_widget_host", render_widget_host);
patches/chromium/resource_file_conflict.patch
+3 -3
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 cd8c1e8c4c4932509a285373f807ad87bc756d81..e58cf961560187ce86ac1f9c1fe09a74ba37f0b7 100644
index 27c64b4c4add8c04a4a39cd0eb9f292b41b596a6..b364de8562d684dcf3e45dc1f83f8133795bff3a 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1749,7 +1749,7 @@ group("extra_resources") {
@@ -1753,7 +1753,7 @@ group("extra_resources") {
]
}
@@ -64,7 +64,7 @@ index cd8c1e8c4c4932509a285373f807ad87bc756d81..e58cf961560187ce86ac1f9c1fe09a74
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1773,6 +1773,12 @@ repack("browser_tests_pak") {
@@ -1777,6 +1777,12 @@ repack("browser_tests_pak") {
deps = [ "//chrome/test/data/webui:resources" ]
}
patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch
+4 -4
View File
@@ -54,10 +54,10 @@ index c1220bb3bc575ffa7c0e207cef7ee0cf3ed4d2b3..a2e58eb7de4561c9d2623ca1c13e7479
if (mouse_event_callback.Run(mouse_event)) {
return;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f59a2adeba9188ccd4673476eb980eabccb0d229..9b2b793ae6bfaf679826e4afbb2fc0fa6dc98561 100644
index d2bfb959e7a671372ecc3329624b1c1c63dfecec..a6b68097aef44b0893eb026bbaba3abded37aa43 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4715,6 +4715,12 @@ void WebContentsImpl::RenderWidgetWasResized(
@@ -4716,6 +4716,12 @@ void WebContentsImpl::RenderWidgetWasResized(
width_changed);
}
@@ -71,10 +71,10 @@ index f59a2adeba9188ccd4673476eb980eabccb0d229..9b2b793ae6bfaf679826e4afbb2fc0fa
const gfx::PointF& client_pt) {
if (delegate_) {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index c008026637dbd1e95d013109ef7b1099d6d94f7c..8e60c73d7ec02714e5834b0475c686c2798a7635 100644
index 34367a786ab91dfcda6e8252d708e961d926b4fc..ba132cdffe870503e54499941745e8941cb6bdab 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1165,6 +1165,7 @@ class CONTENT_EXPORT WebContentsImpl
@@ -1166,6 +1166,7 @@ class CONTENT_EXPORT WebContentsImpl
double GetPendingZoomLevel(RenderWidgetHostImpl* rwh) override;
patches/chromium/support_mixed_sandbox_with_zygote.patch
+2 -2
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 19c2c049e1a29d66cbfbd93420d198842df68bcf..fdb38c97986421122b5e7066c6ada9186e963681 100644
index 61fff829690113a495e9220bac890664b73ce3a2..a5de7de7a4d7a2086eba4d1abc0206bb251287f2 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2071,6 +2071,10 @@ bool RenderProcessHostImpl::Init() {
@@ -2074,6 +2074,10 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
*cmd_line, IsPdf(), IsJitDisabled());
patches/chromium/web_contents.patch
+4 -4
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 6341a5e97e639840bfe2ed778e6028aac8a8dbf4..570bb6ae46ab2989a91e90ebfa56cfe3d9e0c9c2 100644
index 3f6adff654507ff6fbc20e5f238268d57ad7f0a3..d6e96d9b8ff3fc4a09da9a3c88caec7f8514b570 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4439,6 +4439,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -4440,6 +4440,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 6341a5e97e639840bfe2ed778e6028aac8a8dbf4..570bb6ae46ab2989a91e90ebfa56cfe3
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -4449,6 +4456,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -4450,6 +4457,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
@@ -35,7 +35,7 @@ index 6341a5e97e639840bfe2ed778e6028aac8a8dbf4..570bb6ae46ab2989a91e90ebfa56cfe3
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 7f7bc1de14745476dc88787dbad9d65b5914c46d..d08d5d7475e79671e819e0908abf9037961ffa61 100644
index 5bb53e8ecfffa77ef7a101d7058f1ed2876cb052..2fb5495799a7c1f991f84183174a61644478a8e1 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -138,12 +138,15 @@ class PrerenderHandle;
patches/chromium/webview_fullscreen.patch
+4 -4
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 21063c58e982092c6de635d46eaf728b47d2b708..bf65e1803e32af0b683da63eaab06044df5faacf 100644
index 5e3fd5f266523636a8ecd61ac81e4112eb34ef15..8b784147d4320c45d03f111907886b6e2deafd1b 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9585,6 +9585,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -9597,6 +9597,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}
@@ -37,10 +37,10 @@ index 21063c58e982092c6de635d46eaf728b47d2b708..bf65e1803e32af0b683da63eaab06044
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 570bb6ae46ab2989a91e90ebfa56cfe3d9e0c9c2..ae1d1021c5d5ded752fa01b0851a5bb9251fe2be 100644
index d6e96d9b8ff3fc4a09da9a3c88caec7f8514b570..241e5ca73a1973ffd962d07f2d27b4771cbf2485 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4732,21 +4732,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
@@ -4733,21 +4733,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
const input::NativeWebKeyboardEvent& event) {
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
"WebContentsImpl::PreHandleKeyboardEvent");
patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+2 -2
View File
@@ -78,10 +78,10 @@ index 6eef1315ebe70ce614426d847674e1be8c7d9c09..d9b25e76c3bff560e5246d1664562a98
virtual ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel(
const WebSecurityOrigin& origin) {
diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
index f7fcc71c12d08c49f9bc8a266610a1b6803e31d6..9c9bebe9d2072e7d3b399620dfec78b90901bc37 100644
index 3e35d8d22fdcf1b475a709758cab3cabb930b1ab..891cdef8f7171ad3281892cc567fd757ff05b105 100644
--- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
+++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
@@ -288,6 +288,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
@@ -290,6 +290,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
V8PerContextData* per_context_data = script_state_->PerContextData();
std::ignore =
per_context_data->ConstructorForType(global_scope_->GetWrapperTypeInfo());
patches/ffmpeg/link_with_loader_path.patch
+2 -2
View File
@@ -15,10 +15,10 @@ include the out dir, and the linker won't be able to find ffmpeg.dylib
because of so.
diff --git a/BUILD.gn b/BUILD.gn
index a9a017e384352e7a8748e4329483bc8df2032849..7fb21f109bf7de296f21bfa6528d15b2c5bd1bcf 100644
index 4e2e57ad83be5de10fb7322fbb5ec28fadcb17d8..c5f163fe5091625b061f124690b9e4a1d8465548 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -491,7 +491,7 @@ if (is_component_ffmpeg) {
@@ -487,7 +487,7 @@ if (is_component_ffmpeg) {
if (!is_component_build) {
if (is_mac) {
patches/v8/chore_allow_customizing_microtask_policy_per_context.patch
+2 -2
View File
@@ -9,10 +9,10 @@ capability to switch the microtask polciy of these per context microtask queue t
Node.js integration in the renderer.
diff --git a/include/v8-microtask-queue.h b/include/v8-microtask-queue.h
index 6c0fd73921478e9e7af176d19af047bde6cce4c3..9a1cb493e3ae704e8611c937eaeb373bebfdc469 100644
index cd24b59f759ecc6d926d77eb47ba65d17b31b4bf..71deee3f8f0b476c97dc8dcbd44ba2b8eba5c188 100644
--- a/include/v8-microtask-queue.h
+++ b/include/v8-microtask-queue.h
@@ -121,6 +121,9 @@ class V8_EXPORT MicrotaskQueue
@@ -117,6 +117,9 @@ class V8_EXPORT MicrotaskQueue
*/
virtual int GetMicrotasksScopeDepth() const = 0;
shell/browser/electron_browser_client.cc
+2 -1
View File
@@ -27,6 +27,7 @@
#include "base/strings/escape.h"
#include "base/strings/string_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/picture_in_picture/video_overlay_window.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version.h"
@@ -846,7 +847,7 @@ ElectronBrowserClient::GetServiceWorkerStartupData(
std::unique_ptr<content::VideoOverlayWindow>
ElectronBrowserClient::CreateWindowForVideoPictureInPicture(
content::VideoPictureInPictureWindowController* controller) {
auto overlay_window = content::VideoOverlayWindow::Create(controller);
auto overlay_window = CreateVideoOverlayWindow(controller);
#if BUILDFLAG(IS_WIN)
std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
if (!app_user_model_id.empty()) {
shell/browser/extensions/electron_component_extension_resource_manager.cc
+26 -43
View File
@@ -22,6 +22,8 @@
#include "chrome/grit/component_extension_resources_map.h"
#include "chrome/grit/theme_resources.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_config_map.h"
#include "extensions/browser/extension_config_map_factory.h"
#include "extensions/buildflags/buildflags.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_id.h"
@@ -37,6 +39,18 @@
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
namespace extensions {
namespace {
ExtensionConfigProvider* GetConfigProvider(const ExtensionId& extension_id,
content::BrowserContext* context) {
if (!context) {
return nullptr;
}
auto* config_map = ExtensionConfigMapFactory::GetForBrowserContext(context);
return config_map ? config_map->GetConfigProvider(extension_id) : nullptr;
}
} // namespace
class ElectronComponentExtensionResourceManager::Data {
public:
@@ -142,21 +156,14 @@ bool ElectronComponentExtensionResourceManager::IsComponentExtensionResource(
const ui::TemplateReplacements*
ElectronComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
const ExtensionId& extension_id,
const content::BrowserContext* context) const {
content::BrowserContext* context) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
LazyInitData();
auto provider_it = template_data_providers_.find(
ExtensionIdAndContext(extension_id, context));
if (provider_it != template_data_providers_.end() &&
!provider_it->second.is_null()) {
base::DictValue dict = provider_it->second.Run();
ui::TemplateReplacements replacements;
ui::TemplateReplacementsFromDictionaryValue(dict, &replacements);
auto key = ExtensionIdAndContext(extension_id, context);
template_replacements_[key] = std::move(replacements);
return &template_replacements_[key];
if (auto* provider = GetConfigProvider(extension_id, context)) {
CHECK(context);
return provider->GetTemplateReplacements(*context);
}
auto it = data_->template_replacements().find(extension_id);
@@ -167,53 +174,29 @@ bool ElectronComponentExtensionResourceManager::
IsDynamicComponentExtensionResource(
const ExtensionId& extension_id,
const std::string& path,
const content::BrowserContext* context) const {
content::BrowserContext* context) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (path != kDynamicStringsJsPath) {
return false;
}
auto it = template_data_providers_.find(
ExtensionIdAndContext(extension_id, context));
return it != template_data_providers_.end() && !it->second.is_null();
return path == kDynamicStringsJsPath &&
GetConfigProvider(extension_id, context) != nullptr;
}
std::string
ElectronComponentExtensionResourceManager::GetDynamicResourceContent(
const ExtensionId& extension_id,
const std::string& path,
const content::BrowserContext* context) const {
content::BrowserContext* context) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
CHECK_EQ(path, kDynamicStringsJsPath);
CHECK(context);
auto it = template_data_providers_.find(
ExtensionIdAndContext(extension_id, context));
CHECK(it != template_data_providers_.end() && !it->second.is_null());
auto* provider = GetConfigProvider(extension_id, context);
CHECK(provider);
base::DictValue dict = it->second.Run();
base::DictValue dict = provider->GetLoadTimeData(*context);
return base::StringPrintf(kDynamicStringsModuleTemplate,
base::WriteJson(dict).value_or("{}").c_str());
}
base::ScopedClosureRunner
ElectronComponentExtensionResourceManager::RegisterTemplateDataProvider(
const ExtensionId& extension_id,
const content::BrowserContext* context,
TemplateDataProvider provider) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
auto key = ExtensionIdAndContext(extension_id, context);
template_data_providers_[key] = std::move(provider);
return base::ScopedClosureRunner(base::BindOnce(
&ElectronComponentExtensionResourceManager::OnTemplateDataProviderRemoved,
weak_factory_.GetWeakPtr(), key));
}
void ElectronComponentExtensionResourceManager::OnTemplateDataProviderRemoved(
const ExtensionIdAndContext& key) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
template_data_providers_.erase(key);
template_replacements_.erase(key);
}
void ElectronComponentExtensionResourceManager::LazyInitData() const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
shell/browser/extensions/electron_component_extension_resource_manager.h
+3 -22
View File
@@ -5,11 +5,9 @@
#ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_COMPONENT_EXTENSION_RESOURCE_MANAGER_H_
#define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_COMPONENT_EXTENSION_RESOURCE_MANAGER_H_
#include <map>
#include <memory>
#include <string>
#include "base/memory/weak_ptr.h"
#include "extensions/browser/component_extension_resource_manager.h"
#include "extensions/buildflags/buildflags.h"
#include "extensions/common/extension_id.h"
@@ -42,40 +40,23 @@ class ElectronComponentExtensionResourceManager
int* resource_id) const override;
const ui::TemplateReplacements* GetTemplateReplacementsForExtension(
const ExtensionId& extension_id,
const content::BrowserContext* context) const override;
content::BrowserContext* context) const override;
bool IsDynamicComponentExtensionResource(
const ExtensionId& extension_id,
const std::string& path,
const content::BrowserContext* context) const override;
content::BrowserContext* context) const override;
std::string GetDynamicResourceContent(
const ExtensionId& extension_id,
const std::string& path,
const content::BrowserContext* context) const override;
[[nodiscard]] base::ScopedClosureRunner RegisterTemplateDataProvider(
const ExtensionId& extension_id,
const content::BrowserContext* context,
TemplateDataProvider provider) const override;
content::BrowserContext* context) const override;
private:
class Data;
using ExtensionIdAndContext =
std::pair<ExtensionId, const content::BrowserContext*>;
void OnTemplateDataProviderRemoved(const ExtensionIdAndContext& key) const;
void LazyInitData() const;
// Logically const. Initialized on demand to keep browser start-up fast.
mutable std::unique_ptr<const Data> data_;
mutable std::map<ExtensionIdAndContext, TemplateDataProvider>
template_data_providers_;
mutable std::map<ExtensionIdAndContext, ui::TemplateReplacements>
template_replacements_;
mutable base::WeakPtrFactory<const ElectronComponentExtensionResourceManager>
weak_factory_{this};
};
} // namespace extensions
shell/browser/extensions/electron_messaging_delegate.cc
+1
View File
@@ -75,6 +75,7 @@ ElectronMessagingDelegate::CreateReceiverForNativeApp(
const PortId& receiver_port_id,
const std::string& native_app_name,
bool allow_user_level,
const SigningCertificates& android_certificates,
std::string* error_out) {
return nullptr;
}
shell/browser/extensions/electron_messaging_delegate.h
+1
View File
@@ -40,6 +40,7 @@ class ElectronMessagingDelegate : public MessagingDelegate {
const PortId& receiver_port_id,
const std::string& native_app_name,
bool allow_user_level,
const SigningCertificates& android_certificates,
std::string* error_out) override;
void QueryIncognitoConnectability(
content::BrowserContext* context,
shell/renderer/preload_realm_context.cc
+3 -1
View File
@@ -16,6 +16,7 @@
#include "shell/common/node_util.h"
#include "shell/renderer/preload_utils.h"
#include "shell/renderer/service_worker_data.h"
#include "third_party/blink/renderer/bindings/core/v8/script_state_impl.h" // nogncheck
#include "third_party/blink/renderer/core/execution_context/execution_context.h" // nogncheck
#include "third_party/blink/renderer/core/inspector/worker_thread_debugger.h" // nogncheck
#include "third_party/blink/renderer/core/shadow_realm/shadow_realm_global_scope.h" // nogncheck
@@ -305,7 +306,8 @@ void OnCreatePreloadableV8Context(
// Associate the Blink object with the v8::Context.
blink::ScriptState* script_state =
blink::ScriptState::Create(context, world, shadow_realm_global_scope);
blink::MakeGarbageCollected<blink::ScriptStateImpl>(
context, world, *shadow_realm_global_scope);
// Associate the Blink object with the v8::Objects.
global_proxy = context->Global();