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 158.0.8120.0 (main) (#55295)

Browse Source 
* chore: bump chromium in DEPS to 158.0.8120.0

* chore: update patches

* chore: update libc++ filenames

---------

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>
This commit is contained in:
electron-roller[bot]andelectron-claude[bot] authored and GitHub committed 2026-10-23 18:38:32 -07:00
1 parent 7d44215c46
commit e5c444e395
29 files changed
+112 -97
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':
'158.0.8118.0',
'158.0.8120.0',
'node_version':
'v24.22.1',
'nan_version':
filenames.libcxx.gni
+15
View File
@@ -220,6 +220,7 @@ libcxx_headers = [
"//third_party/libc++/src/include/__atomic/atomic_sync_timed.h",
"//third_party/libc++/src/include/__atomic/atomic_waitable_traits.h",
"//third_party/libc++/src/include/__atomic/check_memory_order.h",
"//third_party/libc++/src/include/__atomic/clear_padding.h",
"//third_party/libc++/src/include/__atomic/contention_t.h",
"//third_party/libc++/src/include/__atomic/fence.h",
"//third_party/libc++/src/include/__atomic/floating_point_helper.h",
@@ -1014,6 +1015,9 @@ libcxx_headers = [
"//third_party/libc++/src/include/__functional/compose.h",
"//third_party/libc++/src/include/__functional/default_searcher.h",
"//third_party/libc++/src/include/__functional/function.h",
"//third_party/libc++/src/include/__functional/function_ref.h",
"//third_party/libc++/src/include/__functional/function_ref_common.h",
"//third_party/libc++/src/include/__functional/function_ref_impl.h",
"//third_party/libc++/src/include/__functional/hash.h",
"//third_party/libc++/src/include/__functional/identity.h",
"//third_party/libc++/src/include/__functional/invoke.h",
@@ -1044,6 +1048,7 @@ libcxx_headers = [
"//third_party/libc++/src/include/__fwd/mdspan.h",
"//third_party/libc++/src/include/__fwd/memory.h",
"//third_party/libc++/src/include/__fwd/memory_resource.h",
"//third_party/libc++/src/include/__fwd/optional.h",
"//third_party/libc++/src/include/__fwd/ostream.h",
"//third_party/libc++/src/include/__fwd/pair.h",
"//third_party/libc++/src/include/__fwd/queue.h",
@@ -1238,6 +1243,14 @@ libcxx_headers = [
"//third_party/libc++/src/include/__numeric/transform_exclusive_scan.h",
"//third_party/libc++/src/include/__numeric/transform_inclusive_scan.h",
"//third_party/libc++/src/include/__numeric/transform_reduce.h",
"//third_party/libc++/src/include/__optional/common.h",
"//third_party/libc++/src/include/__optional/comparison.h",
"//third_party/libc++/src/include/__optional/hash.h",
"//third_party/libc++/src/include/__optional/make_optional.h",
"//third_party/libc++/src/include/__optional/nullopt_t.h",
"//third_party/libc++/src/include/__optional/optional.h",
"//third_party/libc++/src/include/__optional/optional_ref.h",
"//third_party/libc++/src/include/__optional/swap.h",
"//third_party/libc++/src/include/__ostream/basic_ostream.h",
"//third_party/libc++/src/include/__ostream/print.h",
"//third_party/libc++/src/include/__ostream/put_character_sequence.h",
@@ -1253,6 +1266,7 @@ libcxx_headers = [
"//third_party/libc++/src/include/__pstl/cpu_algos/find_if.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/for_each.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/merge.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/mismatch.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/stable_sort.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/transform.h",
"//third_party/libc++/src/include/__pstl/cpu_algos/transform_reduce.h",
@@ -1487,6 +1501,7 @@ libcxx_headers = [
"//third_party/libc++/src/include/__type_traits/rank.h",
"//third_party/libc++/src/include/__type_traits/reference_constructs_from_temporary.h",
"//third_party/libc++/src/include/__type_traits/reference_converts_from_temporary.h",
"//third_party/libc++/src/include/__type_traits/register_passable.h",
"//third_party/libc++/src/include/__type_traits/remove_all_extents.h",
"//third_party/libc++/src/include/__type_traits/remove_const.h",
"//third_party/libc++/src/include/__type_traits/remove_const_ref.h",
patches/boringssl/expose_ripemd160.patch
+9 -9
View File
@@ -10,10 +10,10 @@ this patch is required to provide ripemd160 support in the nodejs crypto
module.
diff --git a/crypto/digest/digest_extra.cc b/crypto/digest/digest_extra.cc
index 070ab36ea3b118a69b1b3c1d771412f991e7051e..1ce2fbaeeec7a7c8b6edf0565331cf8bfd890ce1 100644
index 4080076fe02ecd3476e1e80586cfa527c4a5c3d8..680cae2a12707f5874b224fe57bf38fa3fd818cf 100644
--- a/crypto/digest/digest_extra.cc
+++ b/crypto/digest/digest_extra.cc
@@ -48,6 +48,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
@@ -53,6 +53,7 @@ const nid_to_digest nid_to_digest_mapping[] = {
{NID_sha512, EVP_sha512, SN_sha512, LN_sha512},
{NID_sha512_256, EVP_sha512_256, SN_sha512_256, LN_sha512_256},
{NID_md5_sha1, EVP_md5_sha1, SN_md5_sha1, LN_md5_sha1},
@@ -22,7 +22,7 @@ index 070ab36ea3b118a69b1b3c1d771412f991e7051e..1ce2fbaeeec7a7c8b6edf0565331cf8b
// hash function when given a signature OID. To avoid unintended lax parsing
// of hash OIDs, this is no longer supported for lookup by OID or NID.
diff --git a/crypto/fipsmodule/digest/digests.cc.inc b/crypto/fipsmodule/digest/digests.cc.inc
index a246a51103701e0ac8a0722324350a462f95bcc9..ddf0a90337d4e40de09bc345cf959dffdb161ecb 100644
index 23b7409f008e4f73fd385042b0572bb523ac12d9..447deccb187461489585c3260389f0e79b2eae97 100644
--- a/crypto/fipsmodule/digest/digests.cc.inc
+++ b/crypto/fipsmodule/digest/digests.cc.inc
@@ -18,6 +18,7 @@
@@ -31,9 +31,9 @@ index a246a51103701e0ac8a0722324350a462f95bcc9..ddf0a90337d4e40de09bc345cf959dff
#include <openssl/nid.h>
+#include <openssl/ripemd.h>
#include "../../internal.h"
#include "../bcm_interface.h"
@@ -181,4 +182,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_sha512_256) {
#include "../delocate.h"
@@ -185,4 +186,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_sha512_256) {
out->ctx_size = sizeof(SHA512_CTX);
}
@@ -82,12 +82,12 @@ 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 73270deea21a9b4547fdaf6febd21c72dd7fe0bf..ca080f3674c7fa3162a841918eb41b095950b24b 100644
index 2ce07382db807f254061bdb006fb40d91bbcea2b..ac8c10ba4da4a70d16a60044a1d65069cc370cc7 100644
--- a/include/openssl/digest.h
+++ b/include/openssl/digest.h
@@ -58,6 +58,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha3_512(void);
// MD5 and SHA-1, as used in TLS 1.1 and below.
OPENSSL_EXPORT const EVP_MD *EVP_md5_sha1(void);
@@ -75,6 +75,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_shake256(void);
// Digest lookup functions.
+// EVP_ripemd160 is in decrepit and not available by default.
+OPENSSL_EXPORT const EVP_MD *EVP_ripemd160(void);
patches/chromium/add_electron_deps_to_license_credits_file.patch
+1 -1
View File
@@ -7,7 +7,7 @@ Ensure that licenses for the dependencies introduced by Electron
are included in `LICENSES.chromium.html`
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
index 8f54248321922fc129b511fa0db5b35d14685918..4ed74d5511ab97c35b8174361bbcd0caa0067190 100755
index 2abab0dc554360fc7c95f256ee74cb59b8851be5..23eb4090da38c7fde9f6bbd7e5faceeb4c027b3d 100755
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -316,6 +316,36 @@ SPECIAL_CASES = {
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+5 -5
View File
@@ -51,10 +51,10 @@ index d98b5dda96208e3f923aa8a9c6e6eb988004904b..7c91ed2d7a397ad9e36cbecfc13de7bd
void SendRendererPreferencesToRenderer(
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
index c910f273bb3f2388d087043f76d84fcf5406fde2..147a2b7c59f404f3b5c19780b71548e4a1c67269 100644
index 56f2629d87ac241199599f4f4fa3b32f9307da5f..8339aff54788d987cbd2b8c42172e699dbac6478 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -686,8 +686,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
@@ -709,8 +709,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
// OnShowWithPageVisibility will not call NotifyHostAndDelegateOnWasShown,
// which updates `visibility_`, unless the host is hidden. Make sure no update
// is needed.
@@ -116,7 +116,7 @@ index 8bd6b07c5c47f6625b24b1ee227d632bf5d97c5d..b87a4ff69d2b68194bcabe1a60668645
// Visibility -----------------------------------------------------------
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index bffcd7a1d6d93242581742feba221a69fdea013c..139efd8bdbe09d813c55f45c73330f12a772fa17 100644
index 5aca41e3ac3bf62c785ee9cedd159614e9f50385..55c1349f0f305f2fe4860acc6599d89879d35841 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -618,6 +618,7 @@ WebViewImpl::WebViewImpl(
@@ -127,7 +127,7 @@ index bffcd7a1d6d93242581742feba221a69fdea013c..139efd8bdbe09d813c55f45c73330f12
SetVisibilityState(visibility, /*is_initial_state=*/true);
if (prerender_param) {
page_->SetIsPrerendering(true);
@@ -2598,6 +2599,13 @@ void WebViewImpl::SetPageLifecycleStateInternal(
@@ -2602,6 +2603,13 @@ void WebViewImpl::SetPageLifecycleStateInternal(
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
"old_state", old_state, "new_state", new_state);
@@ -141,7 +141,7 @@ index bffcd7a1d6d93242581742feba221a69fdea013c..139efd8bdbe09d813c55f45c73330f12
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
!old_state->is_in_back_forward_cache;
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
@@ -4321,10 +4329,26 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -4327,10 +4335,26 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}
patches/chromium/blink_local_frame.patch
+4 -4
View File
@@ -15,7 +15,7 @@ Refs changes in:
This patch reverts the changes to fix associated crashes in Electron.
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
index 27ad99d14ceaa8f5c39a80b6b75e4fc4f2f8f41e..5f9b93a0c1254da5ae9f1e15aefe72bc552ce46f 100644
index 5e9fa4d5c26afee3cf2c0467cc7a8a86225e81af..bd93452338c38169e46ca831721ce72001b1a16f 100644
--- a/third_party/blink/renderer/core/frame/frame.cc
+++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -134,14 +134,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index 27ad99d14ceaa8f5c39a80b6b75e4fc4f2f8f41e..5f9b93a0c1254da5ae9f1e15aefe72bc
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 7fbc8509d47b204c6ffc48df643ea575af6d3ef2..6fd303095e52ee4f525f37f01bdfd57f93800d5e 100644
index 08b1cfec3bf72f82b607f9f44fc0c781e53fcc8d..0ba77fa825a2cecfb38dd2824ec4055faccaff34 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -784,10 +784,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -796,10 +796,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());
@@ -63,7 +63,7 @@ index 7fbc8509d47b204c6ffc48df643ea575af6d3ef2..6fd303095e52ee4f525f37f01bdfd57f
if (!Client()) {
return false;
}
@@ -862,6 +858,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -874,6 +870,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();
patches/chromium/build_add_electron_tracing_category.patch
+1 -1
View File
@@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 9377661e94e74ab6f74d67306c97713ef794d2ac..e513fcf2eef2ba462c77f6e365d85bc6c4e778fc 100644
index 388aaad777fcebe4add50ef0444ac83fc5398fb0..41e7cdf59f44d31ad63689fc2f507d30caff6a57 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -137,6 +137,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
patches/chromium/build_allow_electron_to_use_exec_script.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script
This is similar to the //build usecase so we're OK adding ourselves here.
diff --git a/.gn b/.gn
index c2a5600e10ccab009471555fd2d1883d767c2418..27a5ed9c63b1bb64a566ff2cb00a76a087a6c4e0 100644
index d03bae73eb0e7bf25788f091840f3e246c430c36..dd872daeedef3bd9795cf249544d6b67f482d973 100644
--- a/.gn
+++ b/.gn
@@ -471,6 +471,31 @@ exec_script_allowlist =
@@ -463,6 +463,31 @@ exec_script_allowlist =
# script. exec_script only happens when the checkout_mesa gclient arg is
# set. If/when a 'proper' GN build for Mesa exists, this can be removed.
"//third_party/dawn/third_party/meson/meson_target.gni",
patches/chromium/can_create_window.patch
+5 -5
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 32a76945364d02008521cce72123cb7918d3a47d..cbd9c1577384785d7d85f89ef60cf86c91b70071 100644
index f3b309d863130b88c200257bcadbfce5660449fa..f2e64e5569741000552218689ae5edf1f1d63791 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10839,6 +10839,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10867,6 +10867,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 32a76945364d02008521cce72123cb7918d3a47d..cbd9c1577384785d7d85f89ef60cf86c
effective_transient_activation_state, params->opener_suppressed,
&no_javascript_access);
@@ -10849,6 +10850,11 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10877,6 +10878,11 @@ void RenderFrameHostImpl::CreateNewWindow(
return;
}
@@ -128,7 +128,7 @@ index 9fc5fa3ce4121e8eb784c7e62fc0321b509788dd..3bdab819749ab7e693ad40852645dce7
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index ae8753aa363d3bf4ad0b58bbb720b7ba9d647a3d..884166af9292168b8b998af0feef7f165996dbbe 100644
index 434bf4b1743d6d85b9912cd369e1e68d80a416e5..c4dd5f3e8c4d88814ecae130eaeee5db63862cae 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -35,6 +35,18 @@ namespace content {
@@ -151,7 +151,7 @@ index ae8753aa363d3bf4ad0b58bbb720b7ba9d647a3d..884166af9292168b8b998af0feef7f16
WebContents* source,
const OpenURLParams& params,
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index b4ef8f00ca8ce9f35ef5dad5f553423baf0acf39..440c5f7ed9ee4b3ace56a4264a12dd9a7f043707 100644
index afebf55b1abc5d3eefde47b3b317bb1692b1b5d4..a5fd5dae63d9d66e974c0c68e831b2b051d78ea0 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -19,6 +19,7 @@
patches/chromium/chore_grandfather_in_electron_views_and_delegates.patch
+3 -3
View File
@@ -10,10 +10,10 @@ Subject: chore: "grandfather in" Electron Views and Delegates
6448510: Lock further access to View::set_owned_by_client(). | https://chromium-review.googlesource.com/c/chromium/src/+/6448510
diff --git a/ui/views/view.h b/ui/views/view.h
index a07ed5f611f8fcf0879dd41259d9a3e414697a00..59e11c624e19e9faa882ed157c7b9240bc4c3b7a 100644
index 11cdeed5625b963108149f99c874dfaa1ed9372c..ea1cc9fc4977a31ef225037c017401ae1f2ecf3f 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -77,6 +77,17 @@ namespace ash {
@@ -78,6 +78,17 @@ namespace ash {
class ArcNotificationContentView;
} // namespace ash
@@ -31,7 +31,7 @@ index a07ed5f611f8fcf0879dd41259d9a3e414697a00..59e11c624e19e9faa882ed157c7b9240
namespace exo {
class ShellSurfaceBase;
}
@@ -308,6 +319,12 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
@@ -284,6 +295,12 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public:
class OwnedByClientPassKey {
private:
patches/chromium/chore_introduce_blocking_api_for_electron.patch
+1 -1
View File
@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
of explicitly adding ScopedAllowBlocking calls as friends.
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index cc087c73765c6ba3babe48c2dde0215c03935f60..d141eae3d8c749ae71145833ad721a799d5b0763 100644
index 5f96a065e9b68bfed8925be3bda69bf3365f6f22..8673b389ff500e53df52124284b0f7f67ad8a709 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -133,6 +133,7 @@ class KeyStorageLinux;
patches/chromium/chore_register_node_as_a_dynamic_trace_category_prefix.patch
+1 -1
View File
@@ -14,7 +14,7 @@ target. Given neither the static nor the dynamic registration can be
upstreamed, the minimal of the two changes is chosen here.
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index e513fcf2eef2ba462c77f6e365d85bc6c4e778fc..74d649e1f22de01b491416a607dc79f83ee3170f 100644
index 41e7cdf59f44d31ad63689fc2f507d30caff6a57..d6f6df37a885db0f0f376c04e7b6212681aa929c 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -16,6 +16,7 @@ PERFETTO_DEFINE_TEST_CATEGORY_PREFIXES("cat",
patches/chromium/disable_hidden.patch
+3 -3
View File
@@ -43,10 +43,10 @@ index 02bdef3bae5a29d874956d88e33e37bf0fd9ce5c..f3c132412ca87c3abda84cf91434a9f7
// |routing_id| must not be IPC::mojom::kRoutingIdNone.
// 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
index 98303c3ef0ad6abff3ddbfd1472d19b57fdd01d1..c910f273bb3f2388d087043f76d84fcf5406fde2 100644
index cdd82d37e4938e5722b958aa0c21a3be066ed017..56f2629d87ac241199599f4f4fa3b32f9307da5f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -745,7 +745,7 @@ void RenderWidgetHostViewAura::HideImpl() {
@@ -768,7 +768,7 @@ void RenderWidgetHostViewAura::HideImpl() {
CHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED);
@@ -55,7 +55,7 @@ index 98303c3ef0ad6abff3ddbfd1472d19b57fdd01d1..c910f273bb3f2388d087043f76d84fcf
host()->WasHidden();
aura::WindowTreeHost* host = window_->GetHost();
aura::Window* parent = window_->parent();
@@ -3871,7 +3871,12 @@ RenderWidgetHostViewAura::DidUpdateVisualProperties(
@@ -3894,7 +3894,12 @@ RenderWidgetHostViewAura::DidUpdateVisualProperties(
void RenderWidgetHostViewAura::DidNavigate() {
CHECK(delegated_frame_host_) << "Cannot be invoked during destruction.";
patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch
+2 -2
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 be51361d43ecd84688d0838f29d35da30f28dd63..c343572412cd634c5f38709b0a8bb54071ef657f 100644
index 5e38acee26fc8aab78580e952315c9677b3bbe01..8d2f19ba73a389ec0cce3b2a93f58dd52f0b6e9e 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -11038,7 +11038,12 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -11066,7 +11066,12 @@ void RenderFrameHostImpl::CreateNewWindow(
new_main_rfh->GetSiteInstance()->browsing_instance_token(),
delegate_->GetColorProviderColorMaps(),
/*widget_screen_rect=*/std::nullopt,
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
+4 -4
View File
@@ -46,10 +46,10 @@ index 5e751bb0e254b6cd67b05c6bd2e677c074717099..c567a09c696413371ed732cc2f81d9b9
'internal-forced-visited-'
):
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
index abe43ce2114077a8bab9a763fa516bf2fd4bc505..b9b84c8a2b6bc960d525349a3fb1cbf295104b4a 100644
index 40d1f0c081980b9a8b11ba01b444edb158dde5ef..8ecf42f338df7f808c8b0f371286284fac647aaa 100644
--- a/third_party/blink/renderer/core/css/css_properties.json5
+++ b/third_party/blink/renderer/core/css/css_properties.json5
@@ -10396,6 +10396,27 @@
@@ -10397,6 +10397,27 @@
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
},
@@ -204,7 +204,7 @@ index b721dd3809c0b6c89574a515bac32d397a1bfb09..750a3603bd18680228220b831709d327
return result;
}
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 8f77de143b1b49daeb36896548c1a859e5ddac07..573d54fa3409c33a7f298e0e442dd646f2e18689 100644
index 817d8653da0dd6307d1663385aa698253092e774..8bc20d06c5f4fa7c734178f7ed937071285298e5 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1745,6 +1745,8 @@ component("platform") {
@@ -315,7 +315,7 @@ index 9d125de843259dae40e6b08eaf65ea3650435295..428219fb35d7a967dcaee91aa1c3628e
auto draw_as_single_path = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 925ff90128278e73bb5118371eaef9609b57b2f5..56c5c4707e5acb88260093fe3206db09126b6d80 100644
index f4aac923866bdfe12187d630d804f3e3e6042929..e54930c610e8f6a5939f7e3fa8d26dcecba59360 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -237,6 +237,10 @@
patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
+3 -3
View File
@@ -130,10 +130,10 @@ index 36410ff29d9c82e59f93fbb82968064bd330dfde..6c3f994e0b184f78bd9442002bb4dfae
virtual void PassiveInsecureContentFound(const WebURL&) {}
diff --git a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc
index 2168cf7675cf43cf3a925033cd9282e173edd88b..ab4f4841f370ef533e6adefd53011acffebabf0e 100644
index bb195df8d1c565848a3da967b12314f41bfb28d0..35c16d475b189ee777f7c0411764bacfcc698cab 100644
--- a/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc
+++ b/third_party/blink/renderer/core/editing/commands/clipboard_commands.cc
@@ -151,7 +151,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame,
@@ -152,7 +152,7 @@ bool ClipboardCommands::CanReadClipboard(LocalFrame& frame,
return true;
}
return frame.GetContentSettingsClient() &&
@@ -142,7 +142,7 @@ index 2168cf7675cf43cf3a925033cd9282e173edd88b..ab4f4841f370ef533e6adefd53011acf
}
bool ClipboardCommands::CanWriteClipboard(LocalFrame& frame,
@@ -383,7 +383,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) {
@@ -384,7 +384,7 @@ bool ClipboardCommands::PasteSupported(LocalFrame* frame) {
return true;
}
return frame->GetContentSettingsClient() &&
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
+2 -2
View File
@@ -30,10 +30,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 0ccaccb74ffee714d518f758bdb9abc65e66cfd5..7f6a0fa5f6cf9325368a7f2173dc3a732e587b43 100644
index d20c526dc7a9b92a57496ac9caff37e3111b1f0a..0eae23304fbc1f29b87f81c792fbab13d61fd6d9 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -13155,6 +13155,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
@@ -13156,6 +13156,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
target_rph_id);
}
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
+2 -2
View File
@@ -9,10 +9,10 @@ focus node change via TextInputManager.
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
index 147a2b7c59f404f3b5c19780b71548e4a1c67269..bfde26dad5460f084013ac59d23c4f62c2903639 100644
index 8339aff54788d987cbd2b8c42172e699dbac6478..747154464c1aa1d8add7c240dd231ef30c32e96e 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -3838,6 +3838,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
@@ -3861,6 +3861,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
}
}
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
+9 -9
View File
@@ -73,10 +73,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..13284f693f406cea171e450af7784a44
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 6fd303095e52ee4f525f37f01bdfd57f93800d5e..4fbfa7a047352ab25117d71f7021a30d610d504a 100644
index 0ba77fa825a2cecfb38dd2824ec4055faccaff34..a14fa97bc74514163535087e8285caeddb417f39 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3370,6 +3370,7 @@ void LocalFrame::RequestExecuteScript(
@@ -3382,6 +3382,7 @@ void LocalFrame::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@@ -84,7 +84,7 @@ index 6fd303095e52ee4f525f37f01bdfd57f93800d5e..4fbfa7a047352ab25117d71f7021a30d
BackForwardCacheAware back_forward_cache_aware,
mojom::blink::WantResultOption want_result_option,
mojom::blink::PromiseResultOption promise_behavior,
@@ -3429,7 +3430,8 @@ void LocalFrame::RequestExecuteScript(
@@ -3441,7 +3442,8 @@ void LocalFrame::RequestExecuteScript(
PausableScriptExecutor::CreateAndRun(
script_state, std::move(script_sources), execute_script_policy,
user_gesture, evaluation_timing, blocking_option, want_result_option,
@@ -95,10 +95,10 @@ index 6fd303095e52ee4f525f37f01bdfd57f93800d5e..4fbfa7a047352ab25117d71f7021a30d
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
index 8a72d43694dc03a4d9412932e477ec83872acf4c..c3518c5a9548615fe10312b73132f5e0fc6094c1 100644
index ca87f409296aec0278f3d05138aaaac6b998ed8f..96f67248f30198279d535a2ad719d1c59e03f5a9 100644
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -867,6 +867,7 @@ class CORE_EXPORT LocalFrame final
@@ -871,6 +871,7 @@ class CORE_EXPORT LocalFrame final
mojom::blink::EvaluationTiming,
mojom::blink::LoadEventBlockingOption,
WebScriptExecutionCallback,
@@ -107,10 +107,10 @@ index 8a72d43694dc03a4d9412932e477ec83872acf4c..c3518c5a9548615fe10312b73132f5e0
mojom::blink::WantResultOption,
mojom::blink::PromiseResultOption,
diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
index 6706dfb8f0e90bc5850e4bd976a47a1c8aef4c98..ce82fc6644ffa51523438bd23c05aded0e04e19e 100644
index 27a63506937d100891856b77215800bff9f354cd..c6691e79b5940cfba68972d6affd5b6ae8dd6bdc 100644
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
@@ -1001,6 +1001,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
@@ -1009,6 +1009,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
std::move(callback).Run(value ? std::move(*value) : base::Value());
},
std::move(callback)),
@@ -319,10 +319,10 @@ index 4ed8807eadcbdef7c77cb06fa072f90e216b9d2d..d12223bb29774d75e78380887299e831
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 25336e24ad6b674ce30263d693257f9aa8f2b302..b553e148ef2776538d72e12fa8b77e107f34adaf 100644
index cd4489cc6d48ff0c23a547f84b11a8a3231381a3..7aa1a3f284aaf82e362eaa1b1108a0950727461e 100644
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -310,6 +310,7 @@ void ExecuteScriptsInMainWorld(
@@ -311,6 +311,7 @@ void ExecuteScriptsInMainWorld(
DOMWrapperWorld::kMainWorldId, sources, user_gesture,
mojom::blink::EvaluationTiming::kSynchronous,
mojom::blink::LoadEventBlockingOption::kDoNotBlock, std::move(callback),
patches/chromium/fix_select_the_first_menu_item_when_opened_via_keyboard.patch
+3 -3
View File
@@ -11,10 +11,10 @@ PlatformStyle::kAutoSelectFirstMenuItemFromKeyboard
covers the other views platforms.
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 7fda897b7b50dc128ab5bce91b925d5047fab370..915f63ba17b69f483bcc1ac4ff19e8632305c595 100644
index 9b5abde427dbbf497286ddc8f4d103999dfff132..7a99f59896795a0f593b080403b8410063f75b18 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -839,6 +839,22 @@ void MenuController::Run(Widget* parent,
@@ -849,6 +849,22 @@ void MenuController::Run(Widget* parent,
SetSelection(root, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
}
@@ -37,7 +37,7 @@ index 7fda897b7b50dc128ab5bce91b925d5047fab370..915f63ba17b69f483bcc1ac4ff19e863
if (button_controller) {
pressed_lock_ = button_controller->TakeLock(
false, ui::LocatedEvent::FromIfValid(event));
@@ -2863,18 +2879,15 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
@@ -2875,18 +2891,15 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
return;
}
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
+15 -15
View File
@@ -58,10 +58,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 7190f24b26c2a251c1da7fa33a6a68fe440fafeb..90129e83bab359966e08fee0d2faede144757268 100644
index ea07454ba2928ad744ff61f3c4c0602d3489ce34..d81cc42c3bf121930c2faa450d182c1fff9ce60c 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1153,6 +1153,7 @@ component("base") {
@@ -1154,6 +1154,7 @@ component("base") {
"//build:ios_buildflags",
"//build/config/compiler:compiler_buildflags",
"//third_party/modp_b64",
@@ -1013,10 +1013,10 @@ index 45e8631ea6e5497edb90b91223d962abe3071849..dbd8cbc192931ee7821f7e76923c6cb2
return kAttributes;
}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 4e929a8d7ce90f7bc4aa9205fd676e27b4d659c9..2402a6091de68d5e37c5ec1039eeb2b4055c6976 100644
index 2bfd29be2bb6e68d521201aea3b1a40d29a32157..959caf0b3b0d88fa7d0bbe455bf604b8a6ef4c45 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -384,6 +384,7 @@ source_set("browser") {
@@ -383,6 +383,7 @@ source_set("browser") {
"//ui/webui/resources",
"//v8",
"//v8:v8_version",
@@ -1134,7 +1134,7 @@ index 10d8a0e16d6bd7e603eddabfd3f053f44d43d7a1..23b8154e7695d2fb4efbd777de6e84f2
///////////////////////////////////////////////////////////////////////////////
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index e41489d4c98fbf96f9bfadfb78c5b0b0f5a5d841..1a6298d187d6245370d7c29c419617a8c401c5d0 100644
index 3339832ee0c80de9f33b1a138db27d8d1e89bb29..55708ed138cc30b3e449afa60b48c6e91e4c75d6 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -279,6 +279,7 @@ source_set("common") {
@@ -1228,7 +1228,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 9674e7884a537e421ae475ba10e9127c7a2d60d7..7b11c454b25816b486dd50fba99e5d117890936a 100644
index a22c2b959397c41c967e615a9c51e35703e577f1..8bb7e9f280b20f1902776069dc230bda04acfdb5 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -649,6 +649,7 @@ static_library("test_support") {
@@ -1248,7 +1248,7 @@ index 9674e7884a537e421ae475ba10e9127c7a2d60d7..7b11c454b25816b486dd50fba99e5d11
}
mojom("content_test_mojo_bindings") {
@@ -2058,6 +2061,7 @@ test("content_browsertests") {
@@ -2059,6 +2062,7 @@ test("content_browsertests") {
"//ui/shell_dialogs",
"//ui/snapshot",
"//ui/webui:test_support",
@@ -1256,7 +1256,7 @@ index 9674e7884a537e421ae475ba10e9127c7a2d60d7..7b11c454b25816b486dd50fba99e5d11
]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3452,6 +3456,7 @@ test("content_unittests") {
@@ -3453,6 +3457,7 @@ test("content_unittests") {
"//ui/shell_dialogs",
"//ui/webui:test_support",
"//url",
@@ -1907,7 +1907,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..3e3aaea0ec6c8fad0d90a931d269af3a
} // namespace blink
diff --git a/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm b/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm
index b3fd5abd10fae78c0bb62da6966e516400d1a452..9af448405391822f851b70e76725ec6c8b0adee1 100644
index 21aa5006a3cd8a2000ed446592118e045ac1592f..03b31de65d5e89d69032dd554e30a2b54511ba25 100644
--- a/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm
+++ b/third_party/blink/renderer/platform/fonts/mac/font_matcher_mac.mm
@@ -41,6 +41,7 @@
@@ -2428,7 +2428,7 @@ index c50d748fb83207ff46e5d46a8979ebea1d5c30f7..e4c4a8cdb71bc872e8dbf998b6bfa7a0
if (is_ios) {
sources += [
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
index 65ae8170664d15c7884261812400d0ed638a681d..86c937f1e6d03b88803a2ca80abff19c5acc6408 100644
index 84060d2c442e2786e12d9837e0128bc4536d7d0b..933f2020ae89a02a39e21a7115b5f651d4a55d21 100644
--- a/ui/gfx/platform_font_mac.mm
+++ b/ui/gfx/platform_font_mac.mm
@@ -19,6 +19,7 @@
@@ -2466,10 +2466,10 @@ index 65ae8170664d15c7884261812400d0ed638a681d..86c937f1e6d03b88803a2ca80abff19c
// enough.
return PlatformFontMac::SystemFontType::kGeneral;
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 5b10316192ea3e9e7ce13d4fdc9d4c789088d9d0..5498c7b4e4bf9f998ad1bb1804f69ad0984a7498 100644
index 8826a46286029be6c4e6b9b6fcf3edb039b3be12..6d93048ea3d6d029e9d6252e12d1e97583aa282c 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -792,6 +792,8 @@ component("views") {
@@ -793,6 +793,8 @@ component("views") {
"IOSurface.framework",
"QuartzCore.framework",
]
@@ -2478,7 +2478,7 @@ index 5b10316192ea3e9e7ce13d4fdc9d4c789088d9d0..5498c7b4e4bf9f998ad1bb1804f69ad0
}
if (is_win) {
@@ -1213,6 +1215,8 @@ source_set("test_support") {
@@ -1214,6 +1216,8 @@ source_set("test_support") {
"//ui/base/mojom:ui_base_types",
]
@@ -2602,10 +2602,10 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
}
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
index f9d0756f8031155c15df2e861c11de9343d6d938..ca00e8523a1b82e86fc74421ff90b566c58687cc 100644
index 56bc81e2f5288a4f59324c1e122b3657d5f24fb2..081f432c376c3ae420cf29769dbd9efd190b4b53 100644
--- a/ui/views/controls/webview/BUILD.gn
+++ b/ui/views/controls/webview/BUILD.gn
@@ -51,6 +51,12 @@ component("webview") {
@@ -53,6 +53,12 @@ component("webview") {
"//url",
]
patches/chromium/notification_provenance.patch
+3 -3
View File
@@ -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 07c6a3ae2f30c9e92da44e1e7fad963a9ae2eae3..33eeed09e590bcd8b9215dfb81ae6bf12188c84d 100644
index 5dbe1126f62679855efa307af388427b9e28c747..a0fb47c198354ce3b15db402c801897ab0f8cd56 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2557,7 +2557,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2558,7 +2558,7 @@ void RenderProcessHostImpl::CreateNotificationService(
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -145,7 +145,7 @@ index 07c6a3ae2f30c9e92da44e1e7fad963a9ae2eae3..33eeed09e590bcd8b9215dfb81ae6bf1
creator_type, std::move(receiver));
break;
}
@@ -2565,7 +2565,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2566,7 +2566,7 @@ void RenderProcessHostImpl::CreateNotificationService(
CHECK(rfh);
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
patches/chromium/patch_osr_control_screen_info.patch
+1 -1
View File
@@ -8,7 +8,7 @@ is updated correctly, instead of overriding GetScreenInfo which seems not
working.
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index c9887e7741ed43523584cc4245dd8463d4f09627..2d630e3a3114ac47bdea2647ec4111b76e5cf913 100644
index dc9ade023294a0722795ae89e94cefc4a26635c3..e8c002a1c7e0e3152d382dc0d10d4577fd2e501b 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -794,7 +794,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
patches/chromium/revert_only_preload_swiftshader_in_gpu_sandbox_init_when_allowed.patch
+2 -2
View File
@@ -22,10 +22,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/8286976; this
patch can be dropped once that or an equivalent lands.
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
index 0a33c6fccbfb23b33456aa264a95a3cd13ed9e66..b5c123182c4c1aba40a7bbefab2bb30763c0a2e0 100644
index 1c728a460bb075d2f6b76db85c208c90db5fb4a8..b85c0560dcf167185d9b636c820392d1d4e74106 100644
--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
@@ -741,17 +741,7 @@ bool GpuInitLegacy::InitializeAndStartSandbox(
@@ -735,17 +735,7 @@ bool GpuInitLegacy::InitializeAndStartSandbox(
base::FilePath module_path;
if (base::PathService::Get(base::DIR_MODULE, &module_path)) {
patches/chromium/revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch
+3 -3
View File
@@ -6,10 +6,10 @@ Subject: Revert "Remove the AllowAggressiveThrottlingWithWebSocket feature."
This reverts commit 615c1810a187840ffeb04096087efff86edb37de.
diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
index 2703401f81925573c0702d662d773e1ab924926e..8084d392bf62e240bdd9c52695ebff6b3dcf326f 100644
index ff3dd99e982a0a3c10be89a43e5f9fc5e7d7791c..5373e1867f461fb8f95ffeb79c08aa1aa3d608d8 100644
--- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
@@ -106,6 +106,17 @@ enum WebSocketOpCode {
@@ -107,6 +107,17 @@ enum WebSocketOpCode {
kOpCodeBinary = 0x2,
};
@@ -27,7 +27,7 @@ index 2703401f81925573c0702d662d773e1ab924926e..8084d392bf62e240bdd9c52695ebff6b
} // namespace
WebSocketChannelImpl::MessageDataDeleter::MessageDataDeleter(
@@ -308,7 +319,11 @@ bool WebSocketChannelImpl::Connect(
@@ -309,7 +320,11 @@ bool WebSocketChannelImpl::Connect(
// reset even if the `WebSocketChannel` is closed.
feature_handle_for_scheduler_ = scheduler->RegisterFeature(
SchedulingPolicy::Feature::kWebSocket,
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 33eeed09e590bcd8b9215dfb81ae6bf12188c84d..9c0ddb60ef6d2d6d80b8795fb29e920a8c2ceced 100644
index a0fb47c198354ce3b15db402c801897ab0f8cd56..951ecd1e1ad2a0d0dd329b9e80566c030719e8b8 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2135,6 +2135,10 @@ bool RenderProcessHostImpl::Init() {
@@ -2136,6 +2136,10 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
*cmd_line, IsPdf(), IsJitDisabled(), GetID());
patches/chromium/webhid_webusb_key_document_services_on_the_requesting_frame_s_origin.patch
+4 -4
View File
@@ -19,10 +19,10 @@ This is specific to Electron's permission model and is not intended for
upstream.
diff --git a/content/browser/hid/hid_service.cc b/content/browser/hid/hid_service.cc
index b7bedaffd8505e2824f8c4e51bbcf0be3816635b..869f0dda9bdca38b69c8d5faed9aead5bdb6aed9 100644
index 5059dbb1463ac6801fc27d989f604942f9238d26..f5f103ecdd0390fcf0e84ef79bbfc2be490053e4 100644
--- a/content/browser/hid/hid_service.cc
+++ b/content/browser/hid/hid_service.cc
@@ -135,7 +135,7 @@ HidService::HidService(
@@ -137,7 +137,7 @@ HidService::HidService(
HidService::HidService(RenderFrameHostImpl* render_frame_host)
: HidService(render_frame_host,
/*service_worker_version=*/nullptr,
@@ -32,10 +32,10 @@ index b7bedaffd8505e2824f8c4e51bbcf0be3816635b..869f0dda9bdca38b69c8d5faed9aead5
HidService::HidService(
base::WeakPtr<ServiceWorkerVersion> service_worker_version,
diff --git a/content/browser/usb/web_usb_service_impl.cc b/content/browser/usb/web_usb_service_impl.cc
index e0c9c2ac4518dc03dc3377ffc553aac9cec7bbed..0403a237756bbdc4cdd6b6a9992a65d191782771 100644
index d85b45867243a476a64ebaf00d4ea4cd495d2a4c..9b5b86a8ab694496bf5691780f45cb8a57c5bbe0 100644
--- a/content/browser/usb/web_usb_service_impl.cc
+++ b/content/browser/usb/web_usb_service_impl.cc
@@ -206,7 +206,7 @@ void WebUsbServiceImpl::Create(
@@ -208,7 +208,7 @@ void WebUsbServiceImpl::Create(
std::make_unique<WebUsbServiceImpl>(
&render_frame_host,
/*service_worker_version=*/nullptr,
patches/chromium/webhid_webusb_pass_the_frame_to_canrequestdevicepermission.patch
+4 -4
View File
@@ -107,10 +107,10 @@ index 9463c12f2ab56c4bf04f80d0dd4ae7c4bad36891..f13ddc2c177b1d2ee90fd298fe169553
/*browser_context=*/nullptr, /*frame=*/nullptr, origin,
device::mojom::UsbDeviceInfo()));
diff --git a/content/browser/hid/hid_service.cc b/content/browser/hid/hid_service.cc
index 54e6b22689716b55b89512c80e49226b8b6e4235..b7bedaffd8505e2824f8c4e51bbcf0be3816635b 100644
index ff6959cc8dea83f1d1cac6d0fbbf5450b9f5ba03..5059dbb1463ac6801fc27d989f604942f9238d26 100644
--- a/content/browser/hid/hid_service.cc
+++ b/content/browser/hid/hid_service.cc
@@ -461,8 +461,8 @@ void HidService::RequestDevice(
@@ -464,8 +464,8 @@ void HidService::RequestDevice(
std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
RequestDeviceCallback callback) {
HidDelegate* delegate = GetContentClient()->browser()->GetHidDelegate();
@@ -150,10 +150,10 @@ index 0c6a091a224fcbb26bb134accf69d42e191e6041..f93b6402c1366d8a34da5e5d5e5268a9
void(BrowserContext*,
const url::Origin&,
diff --git a/content/browser/usb/web_usb_service_impl.cc b/content/browser/usb/web_usb_service_impl.cc
index 3c34492e7274ddc3d628639b3f46acae0c6600d1..e0c9c2ac4518dc03dc3377ffc553aac9cec7bbed 100644
index 030a41a3c904f61c23d37e625eadb769c3e73fc7..d85b45867243a476a64ebaf00d4ea4cd495d2a4c 100644
--- a/content/browser/usb/web_usb_service_impl.cc
+++ b/content/browser/usb/web_usb_service_impl.cc
@@ -336,8 +336,8 @@ void WebUsbServiceImpl::GetPermission(
@@ -338,8 +338,8 @@ void WebUsbServiceImpl::GetPermission(
blink::mojom::WebUsbRequestDeviceOptionsPtr options,
GetPermissionCallback callback) {
auto* delegate = GetContentClient()->browser()->GetUsbDelegate();
patches/chromium/webview_fullscreen.patch
+2 -2
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 cbd9c1577384785d7d85f89ef60cf86c91b70071..be51361d43ecd84688d0838f29d35da30f28dd63 100644
index f2e64e5569741000552218689ae5edf1f1d63791..5e38acee26fc8aab78580e952315c9677b3bbe01 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9769,6 +9769,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -9797,6 +9797,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}