Skip to content

Commit 1bbb407

Browse files
electron-botElectron BotnornagonJohn Kleinschmidt
authored
chore: bump chromium to 2600291d041c530698616a4716cdf (master) (electron#23122)
* chore: bump chromium in DEPS to 99e60beb593ecf98f8a441e3f03a13b68cfcb311 * update patches * chore: bump chromium in DEPS to b1abadda21f417ba5e8276c4dd779d31445d16cd * update patches * 2146532: gtkui: Fix standalone Ozone/Wayland configuration https://chromium-review.googlesource.com/c/chromium/src/+/2146532 * 2145152: Pass source URL when setting a cookie https://chromium-review.googlesource.com/c/chromium/src/+/2145152 * lint * chore: bump chromium in DEPS to 8897189f1da5a3670bbe32d343767fd71f80d779 * chore: bump chromium in DEPS to 8ac51eeee93a02ed5b81f47e28627079edeecde0 * chore: bump chromium in DEPS to e897b8003f3a5f3c8d654eee9b03c513046ae7ea * chore: bump chromium in DEPS to 7b80f9c82122600291d041c530698616a4716cdf * Update patches * Move definition of WebInputEvent enums into mojo https://chromium-review.googlesource.com/c/chromium/src/+/2152777 * update patches Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
1 parent ba39281 commit 1bbb407

38 files changed

+138
-136
lines changed

‎BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ source_set("electron_lib") {
505505
if (use_x11) {
506506
deps += [
507507
"//ui/gfx/x",
508-
"//ui/gtk:x",
508+
"//ui/gtk/x",
509509
]
510510
}
511511
configs += [ ":gio_unix" ]

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gclient_gn_args = [
1212

1313
vars = {
1414
'chromium_version':
15-
'c5cbec6b4ac8f405dc5d5e416ffaf640aa3d088a',
15+
'7b80f9c82122600291d041c530698616a4716cdf',
1616
'node_version':
1717
'v12.16.2',
1818
'nan_version':

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents
1010
available, which there isn't in the case of the 'net' module.
1111

1212
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
13-
index a0d035ef7cbc701916ef0e10ce33ee62bae0777e..e556caa1e1f013559130794601fb9f3c098e5553 100644
13+
index 45e920425345dd3cdb2427df5f60f6d8cc81e07a..9f3e54bb0dc28ed6d6c2c49686bb24bb50d27a78 100644
1414
--- a/services/network/public/mojom/network_context.mojom
1515
+++ b/services/network/public/mojom/network_context.mojom
1616
@@ -161,6 +161,25 @@ struct HttpAuthStaticNetworkContextParams {
@@ -49,18 +49,18 @@ index a0d035ef7cbc701916ef0e10ce33ee62bae0777e..e556caa1e1f013559130794601fb9f3c
4949
// the per-context allow patterns that is managed via NetworkContext
5050
// interface. This still respects the per-context block lists.
5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index 2664641db02ca54ff8e95a42a90fdb02de0f4b32..417fb715a846af104086d00802abaf00f7bc226e 100644
52+
index 017193c28b387615dad57d50ceffe1c916fc7bea..ef8b093d4f7b13d9f7e7c25ce90c7cc1891dde0a 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
55-
@@ -470,6 +470,7 @@ URLLoader::URLLoader(
55+
@@ -471,6 +471,7 @@ URLLoader::URLLoader(
5656
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
5757
base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
5858
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
5959
+ mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
6060
mojom::OriginPolicyManager* origin_policy_manager,
6161
std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory)
6262
: url_request_context_(url_request_context),
63-
@@ -526,6 +527,11 @@ URLLoader::URLLoader(
63+
@@ -527,6 +528,11 @@ URLLoader::URLLoader(
6464
header_client_.set_disconnect_handler(
6565
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
6666
}
@@ -72,7 +72,7 @@ index 2664641db02ca54ff8e95a42a90fdb02de0f4b32..417fb715a846af104086d00802abaf00
7272
if (want_raw_headers_) {
7373
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
7474
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
75-
@@ -1015,7 +1021,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
75+
@@ -1016,7 +1022,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
7676

7777
void URLLoader::OnAuthRequired(net::URLRequest* url_request,
7878
const net::AuthChallengeInfo& auth_info) {
@@ -81,7 +81,7 @@ index 2664641db02ca54ff8e95a42a90fdb02de0f4b32..417fb715a846af104086d00802abaf00
8181
OnAuthCredentials(base::nullopt);
8282
return;
8383
}
84-
@@ -1031,11 +1037,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
84+
@@ -1032,11 +1038,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
8585
if (url_request->response_headers())
8686
head->headers = url_request->response_headers();
8787
head->auth_challenge_info = auth_info;

‎patches/chromium/blink_local_frame.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ when there is code doing that.
1414
This patch reverts the change to fix the crash in Electron.
1515

1616
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
17-
index d051a7e6621e70fb86434a000d5736fea040fe1c..0100d8ec83d86a5ca225ac08f4e7534862a5e245 100644
17+
index 9f3d51c820c850737d4ce2489bbddeee08fb1792..bd5a98dfe75bcaf3a84a9ae4e96f35caa7848aa7 100644
1818
--- a/third_party/blink/renderer/core/frame/local_frame.cc
1919
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
2020
@@ -472,10 +472,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {

‎patches/chromium/blink_world_context.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
77
otherwise not available in the Blink API.
88

99
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
10-
index 8a545fcae6275e77b4dcc422be52402b96ef9d1c..fb84aa2239222a1b1ed9ddd0dd4194e326758d37 100644
10+
index afbed9686b4fccd43991f16be15a261486c127b9..80398b633bed8cd7d04f1ecb44abc306131fa977 100644
1111
--- a/third_party/blink/public/web/web_local_frame.h
1212
+++ b/third_party/blink/public/web/web_local_frame.h
1313
@@ -334,6 +334,9 @@ class WebLocalFrame : public WebFrame {
@@ -21,10 +21,10 @@ index 8a545fcae6275e77b4dcc422be52402b96ef9d1c..fb84aa2239222a1b1ed9ddd0dd4194e3
2121
// that the script evaluated to with callback. Script execution can be
2222
// suspend.
2323
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
24-
index 8944b0e99d757cbe3aac98af0d86ac386c62052b..a12d14bbc49e8f3f4034cb63377aa274a41f6ffd 100644
24+
index bef9aa2ebcebea5e57f67ac03a1b16f6b0bfaa97..5deb335845057b1fb4e051af91f926ffeb2dd270 100644
2525
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
2626
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
27-
@@ -924,6 +924,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
27+
@@ -925,6 +925,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
2828
return MainWorldScriptContext()->Global();
2929
}
3030

@@ -39,7 +39,7 @@ index 8944b0e99d757cbe3aac98af0d86ac386c62052b..a12d14bbc49e8f3f4034cb63377aa274
3939
return BindingSecurity::ShouldAllowAccessToFrame(
4040
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
4141
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
42-
index 27ede2774376e2fa348be97c941ab6c6d0cba88f..9d787b5e62efdf7ac495f7ef230ce2eddc47d03d 100644
42+
index 7f031166c0e98c06a93b419e11e1b2b9989a8e4e..ca5eb27215f12d0c15d9cd4a5ecc121327977ba4 100644
4343
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
4444
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
4545
@@ -161,6 +161,8 @@ class CORE_EXPORT WebLocalFrameImpl final

‎patches/chromium/build_add_electron_tracing_category.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ categories in use are known / declared. This patch is required for us
88
to introduce a new Electron category for Electron-specific tracing.
99

1010
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
11-
index ac67c35bbcb0e8b73e2059c1dfd5b510235449c4..648c35ba8eae74e8264f6d0e2ac74785d31460ae 100644
11+
index e52d62b2c66c74e3876c68be92ed1c5c7b5ba43a..8da9bcc73e7b3fe6cb6d59656cfc523239642a96 100644
1212
--- a/base/trace_event/builtin_categories.h
1313
+++ b/base/trace_event/builtin_categories.h
14-
@@ -68,6 +68,7 @@
14+
@@ -74,6 +74,7 @@
1515
X("dwrite") \
1616
X("DXVA Decoding") \
1717
X("EarlyJava") \

‎patches/chromium/can_create_window.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
12-
index d3aa739956bf04de6ad0882f04d030e2901ab80d..04debb0b15a068d6216ccd7e5295a417c18c8861 100644
12+
index 347f57759468c89583c6366e6f9769ea6e2c777a..a0183ecd4c85a4d4c1019a108311a1c3b4499d9a 100644
1313
--- a/content/browser/frame_host/render_frame_host_impl.cc
1414
+++ b/content/browser/frame_host/render_frame_host_impl.cc
1515
@@ -4341,6 +4341,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -21,10 +21,10 @@ index d3aa739956bf04de6ad0882f04d030e2901ab80d..04debb0b15a068d6216ccd7e5295a417
2121
&no_javascript_access);
2222

2323
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24-
index b93b364cc24369589a61da02ebed82207e04d658..2076b318c689a3998ca19c8393810d53d1d986d2 100644
24+
index d0401023f395e05a628b529275440b60731f56e1..724a39e7a7c6157583050a31e51e3a54c029cce2 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -2946,9 +2946,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
27+
@@ -2960,9 +2960,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
2828
}
2929

3030
if (delegate_) {

‎patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
77
Electrons grit header instead of Chromes
88

99
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
10-
index 0723a28167732c372ca567899d48363fb61e3ba2..b2b8bc688972369f52077a76e4e70cdb89314eb7 100644
10+
index 0530163fc4536e0153194209a0a1e8566f479fda..3f9ae0020ad07d5c56fa356a37e94e4be0d5f516 100644
1111
--- a/chrome/browser/BUILD.gn
1212
+++ b/chrome/browser/BUILD.gn
13-
@@ -5317,6 +5317,7 @@ jumbo_static_library("browser") {
13+
@@ -5304,6 +5304,7 @@ jumbo_static_library("browser") {
1414
deps += [
1515
"//components/spellcheck/browser",
1616
"//components/spellcheck/common",

‎patches/chromium/crashpad_pid_check.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ https://github.com/electron/electron/pull/18483#discussion_r292703588
1616
https://github.com/electron/electron/pull/18483#issuecomment-501090683
1717

1818
diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
19-
index 2593ff2de0327c393c30cae9962a329c5e27b64e..e89b8ff675bed2fa65263ea451d40995e0b010b7 100644
19+
index c841f7bc5c3d9962ea24664f26c6867ded529c7b..13218a598bbd4b51cd9a045879ee20b0491f8146 100644
2020
--- a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
2121
+++ b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
22-
@@ -448,9 +448,16 @@ bool ExceptionHandlerServer::ServiceClientConnection(
22+
@@ -445,9 +445,16 @@ bool ExceptionHandlerServer::ServiceClientConnection(
2323
DWORD real_pid = 0;
2424
if (get_named_pipe_client_process_id(service_context.pipe(), &real_pid) &&
2525
message.registration.client_process_id != real_pid) {

‎patches/chromium/delay_lock_the_protocol_scheme_registry.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
1919
re-submitting the patch.
2020

2121
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
22-
index bb72915a26e298bdb81009248fb3fb4df7bddab5..00d991ad0183ec0c82d23633c86a3c0d7a6e6754 100644
22+
index 67d7e8e69d8a9b8b34b82b83bdf688df4c17ed59..9f6b797ea0489fc87b33a36bbcaae84a2cbf05f3 100644
2323
--- a/content/app/content_main_runner_impl.cc
2424
+++ b/content/app/content_main_runner_impl.cc
25-
@@ -671,7 +671,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
25+
@@ -640,7 +640,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
2626
}
2727
#endif
2828

@@ -32,7 +32,7 @@ index bb72915a26e298bdb81009248fb3fb4df7bddab5..00d991ad0183ec0c82d23633c86a3c0d
3232

3333
#if !defined(OS_ANDROID)
3434
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
35-
index d0a31f2406ee5c0dcc1f49e09177c914e8602132..a46deedb27c6509afaad40563bb2cbf49777fe68 100644
35+
index c00901a2a4ef59a63033c6669171ec9e3ffd2686..d637b79d9df82ad44b1eed8529024a21e0b3555b 100644
3636
--- a/content/common/url_schemes.cc
3737
+++ b/content/common/url_schemes.cc
3838
@@ -49,7 +49,7 @@ std::vector<std::string>& GetMutableServiceWorkerSchemes() {
@@ -44,7 +44,7 @@ index d0a31f2406ee5c0dcc1f49e09177c914e8602132..a46deedb27c6509afaad40563bb2cbf4
4444
// On Android and in tests, schemes may have been registered already.
4545
if (g_registered_url_schemes)
4646
return;
47-
@@ -104,7 +104,8 @@ void RegisterContentSchemes() {
47+
@@ -105,7 +105,8 @@ void RegisterContentSchemes() {
4848
// threadsafe so must be called when GURL isn't used on any other thread. This
4949
// is really easy to mess up, so we say that all calls to Add*Scheme in Chrome
5050
// must be inside this function.
@@ -68,10 +68,10 @@ index 3038f9d25798f36811b6398f8cc0e7d83ecc41b0..68189c36c47ef85b345b0ccc40c456f8
6868
// Re-initializes schemes for tests.
6969
CONTENT_EXPORT void ReRegisterContentSchemesForTests();
7070
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
71-
index af1200a0f2e04c1582e527b609a2e89a97bb0f4c..7ab4cd4a1d8aefcb4bd90d68870f02f3edcff5a7 100644
71+
index 6c27d324e6235051875b88c4bc5bd362d3907f3c..06c17d6673d280fabf5b47244e7f7f7ab374f9a3 100644
7272
--- a/content/public/app/content_main_delegate.cc
7373
+++ b/content/public/app/content_main_delegate.cc
74-
@@ -40,6 +40,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() {
74+
@@ -37,6 +37,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() {
7575
return 0;
7676
}
7777

‎patches/chromium/disable-redraw-lock.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
1515
can be found at https://github.com/electron/electron/issues/1821
1616

1717
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
18-
index d887bfd2e75be9c9f3d29a6ebf6d37abb639bc4d..f9cfb7b49bd8d5eeb4d88acd99c048d06b278ccf 100644
18+
index 0328f536a10de1ff4b6fd0a70c1b80c260aa7b87..2bb93842c74feb1d3f33d4589b7a75ceff8858ef 100644
1919
--- a/ui/views/win/hwnd_message_handler.cc
2020
+++ b/ui/views/win/hwnd_message_handler.cc
2121
@@ -306,6 +306,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index d887bfd2e75be9c9f3d29a6ebf6d37abb639bc4d..f9cfb7b49bd8d5eeb4d88acd99c048d0
3737
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
3838
!ui::win::IsAeroGlassEnabled())) {
3939
if (should_lock_)
40-
@@ -976,6 +981,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
40+
@@ -969,6 +974,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
4141
return scoped_enable;
4242
}
4343

@@ -49,7 +49,7 @@ index d887bfd2e75be9c9f3d29a6ebf6d37abb639bc4d..f9cfb7b49bd8d5eeb4d88acd99c048d0
4949
// HWNDMessageHandler, gfx::WindowImpl overrides:
5050

5151
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
52-
index 7b56d58faff84a72cc8cf9f77daeafdee110ce3a..d46ba47aaa31a0b893ab43e9f70dddbc48c5ea41 100644
52+
index 4da6edd086c9df20af7cdcb5c6020cd61166fbea..81b300c2533a3aaa6e0c343405a6040351061e27 100644
5353
--- a/ui/views/win/hwnd_message_handler.h
5454
+++ b/ui/views/win/hwnd_message_handler.h
5555
@@ -203,6 +203,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,

0 commit comments

Comments
 (0)