Skip to content

Commit 39baf68

Browse files
electron-botcodebytereMarshallOfSoundlocdeepak1556
authored
chore: bump chromium to 5b340c815ce15ab2efcf277ed19e9 (master) (electron#22064)
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: loc <andy@slack-corp.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
1 parent 3a331ff commit 39baf68

File tree

126 files changed

+993
-907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+993
-907
lines changed

‎.circleci/config.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,18 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
299299
sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
300300
fi
301301
302+
# On macOS delete all .git directories under src/ expect for
303+
# third_party/angle/ because of build time generation of file
304+
# gen/angle/commit.h depends on third_party/angle/.git/HEAD
305+
# https://chromium-review.googlesource.com/c/angle/angle/+/2074924
306+
# TODO: maybe better to always leave out */.git/HEAD file for all targets ?
302307
step-delete-git-directories: &step-delete-git-directories
303308
run:
304309
name: Delete all .git directories under src on MacOS to free space
305310
command: |
306311
if [ "`uname`" == "Darwin" ]; then
307312
cd src
308-
( find . -type d -name ".git" ) | xargs rm -rf
313+
( find . -type d -name ".git" -not -path "./third_party/angle/*" ) | xargs rm -rf
309314
fi
310315
311316
# On macOS the yarn install command during gclient sync was run on a linux

‎DEPS

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ gclient_gn_args = [
1212

1313
vars = {
1414
'chromium_version':
15-
'ddac4c3cc1528254008f9e7a2aea5d4426906bfd',
15+
'7178455852d5b340c815ce15ab2efcf277ed19e9',
1616
'node_version':
1717
'v12.16.1',
1818
'nan_version':
19-
'2ee313aaca52e2b478965ac50eb5082520380d1b',
19+
'2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
2020

2121
'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
2222
'pyyaml_version': '3.12',

‎patches/chromium/.patches

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
8282
accessible_pane_view.patch
8383
fixme_grit_conflicts.patch
8484
fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch
85-
fix_use_native_window_button_positions_when_macos_locale_is_rtl.patch
8685
use_electron_resources_in_pdf_util.patch
8786
hack_plugin_response_interceptor_to_point_to_electron.patch
8887
fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
89-
expose_aria_trees_as_tables_for_macos_accessibility.patch
9088
feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
9189
feat_enable_offscreen_rendering_with_viz_compositor.patch
90+
delay_lock_the_protocol_scheme_registry.patch
91+
gpu_notify_when_dxdiag_request_fails.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index 6c446a1506dd1c7728c82f5b11cf7fd3575383d9..057fe111375542e68cad4283dbf2295a977a891a 100644
13+
index 24f9e8efd14ea8e4bb739655c662d01c8c4b80c5..c354891df92db510291ba351ee3bc88b07b4d990 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -261,6 +261,10 @@ int GpuMain(const MainFunctionParams& parameters) {
16+
@@ -262,6 +262,10 @@ int GpuMain(const MainFunctionParams& parameters) {
1717

1818
logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
1919

@@ -24,7 +24,7 @@ index 6c446a1506dd1c7728c82f5b11cf7fd3575383d9..057fe111375542e68cad4283dbf2295a
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -383,7 +387,6 @@ int GpuMain(const MainFunctionParams& parameters) {
27+
@@ -384,7 +388,6 @@ int GpuMain(const MainFunctionParams& parameters) {
2828
}));
2929
#endif
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
1010
context, which can cause some preload scripts to trip.
1111

1212
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
13-
index 68654a3e7d5ec6caddccb667f9f8fa2feabfa71b..650ce53e112bd65e1901a09480452855a0c16dda 100644
13+
index 156ba739a984347135857f8019fda0bfb01c97ad..f4093e9bb8b54d82c6d70375977c0ad91dc90580 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
1616
@@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index 68654a3e7d5ec6caddccb667f9f8fa2feabfa71b..650ce53e112bd65e1901a09480452855
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 6730d6f6eb8448452991ebf5968a8c5a398b6a88..b87f9c7ac0f31ec33f03c36131c3255c8a31c22c 100644
26+
index faa3a77cb545114d9fd8f772d869ba822ad72386..61db7a2e08d5b88587fcd6a0d9ee43027a3f2bf6 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -5187,6 +5187,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4919,6 +4919,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index 6730d6f6eb8448452991ebf5968a8c5a398b6a88..b87f9c7ac0f31ec33f03c36131c3255c
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index bc896201057832415b5d54dc8987bb74bf7aa778..5c96af71646722b1108a8d6eafba1adaddf0a05a 100644
43+
index 57092be996f10ca650cd291be30b45a2a950d159..1c60c1f7075c622137ab2847c8166fb466be8533 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -773,6 +773,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -748,6 +748,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
bool ShouldTrackUseCounter(const blink::WebURL& url) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index bc896201057832415b5d54dc8987bb74bf7aa778..5c96af71646722b1108a8d6eafba1ada
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index 30638c31e30d98bb23292115b25b528ff8e8f62c..e0f2f786b75f861851d1194f57b253a173053299 100644
56+
index 643b63d2ed90362ed615d8003ac02bbba606c5ef..b33fcc64464d5d57177794146854abf6dea627b1 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -652,6 +652,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -555,6 +555,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,10 +67,10 @@ index 30638c31e30d98bb23292115b25b528ff8e8f62c..e0f2f786b75f861851d1194f57b253a1
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
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
70-
index 8095edd988c171a8ad7382d1c2f9fa63ee9e5ffc..510dae593d2a0e2ce13a2879dde5c31e01d21c21 100644
70+
index d20d24c0ba6025af06f5f61cefd3e96e687c123d..c6cb7af9c2ec7e812954b7725f8506c1d9d115de 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
73-
@@ -231,6 +231,7 @@ void LocalWindowProxy::Initialize() {
73+
@@ -215,6 +215,7 @@ void LocalWindowProxy::Initialize() {
7474
}
7575

7676
InstallConditionalFeatures();
@@ -79,10 +79,10 @@ index 8095edd988c171a8ad7382d1c2f9fa63ee9e5ffc..510dae593d2a0e2ce13a2879dde5c31e
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
82-
index f8c512c9db0b88904a562b7d4195790d4b0f86a6..d31ef9bd5b98f584a3296638662ae0d27aa37b65 100644
82+
index 40422650f8bc6b23d92ac670322585441a147446..e0a3f69ca2a19fdb5860ab6a0d2d4a978d5b699f 100644
8383
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
8484
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
85-
@@ -267,6 +267,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
85+
@@ -348,6 +348,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
8686
web_frame_->Client()->DidCreateScriptContext(context, world_id);
8787
}
8888

@@ -97,10 +97,10 @@ index f8c512c9db0b88904a562b7d4195790d4b0f86a6..d31ef9bd5b98f584a3296638662ae0d2
9797
v8::Local<v8::Context> context,
9898
int32_t world_id) {
9999
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
100-
index a055f4b0cc1ccc30752b65d6dc54e638e9b63001..0e6501adbf6f9696429c3fa95357de399ee30a9d 100644
100+
index 835b91bc46f1b2b0d0d4dbfafaa42c1ce9d6a6ca..b067640f61ed836db62d30b05f379f4aa0b93f82 100644
101101
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
102102
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
103-
@@ -79,6 +79,8 @@ class LocalFrameClientImpl final : public LocalFrameClient {
103+
@@ -80,6 +80,8 @@ class LocalFrameClientImpl final : public LocalFrameClient {
104104

105105
void DidCreateScriptContext(v8::Local<v8::Context>,
106106
int32_t world_id) override;
@@ -110,10 +110,10 @@ index a055f4b0cc1ccc30752b65d6dc54e638e9b63001..0e6501adbf6f9696429c3fa95357de39
110110
int32_t world_id) override;
111111

112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
113-
index 1d6facb9ec63abebc5b79a57860765bc8b3f6638..0b58cb679ed34c54e39af661d4a432d482db8c3c 100644
113+
index c30c58b1ff71cb3a80412143c55e2e67f2ab43ec..f7089b126b5aa35bcc65a6312ed21075c916781c 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
116-
@@ -303,6 +303,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
116+
@@ -289,6 +289,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
117117

118118
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
119119
int32_t world_id) = 0;
@@ -123,10 +123,10 @@ index 1d6facb9ec63abebc5b79a57860765bc8b3f6638..0b58cb679ed34c54e39af661d4a432d4
123123
int32_t world_id) = 0;
124124
virtual bool AllowScriptExtensions() = 0;
125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index f3f00e7d6ac44d77dd75997abf8b93eb59476eb3..2010792697b3443dd6f5058bed5ccd0026c4a152 100644
126+
index 6d5be783ec5d25efca2aef1c5da48c0cc4704a28..f8c268110047520a03ca78ab5efb8d82ee4e7bdc 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -370,6 +370,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -364,6 +364,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/add_realloc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
3939

4040
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
4141
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
42-
index 7aa84a3e19c257dde8f48d25743dc8ab2a3a0a30..58cbfc6e6f9f916ace683705d8a87ee05dc73422 100644
42+
index 8cb127650e7b8b96e6155d2cb7f31f67625b1ce5..3b079ae1ac470208ac543ceca8f564591ede49eb 100644
4343
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
4444
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
45-
@@ -659,6 +659,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
45+
@@ -661,6 +661,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
4646
size, ArrayBufferContents::kDontInitialize);
4747
}
4848

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ 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 78fd4bd72b07f38b447840b584253883756fe021..6d8aaecc08207456f243125db8e6d7c74f731d87 100644
13+
index b98cb1c863c72f631adad78dcb4c6412b42e8680..2d964693da7f9f2ea351f24c28ba04953988f9b1 100644
1414
--- a/services/network/public/mojom/network_context.mojom
1515
+++ b/services/network/public/mojom/network_context.mojom
16-
@@ -191,6 +191,25 @@ struct HttpAuthStaticNetworkContextParams {
16+
@@ -193,6 +193,25 @@ struct HttpAuthStaticNetworkContextParams {
1717
= DefaultCredentials.ALLOW_DEFAULT_CREDENTIALS;
1818
};
1919

@@ -39,7 +39,7 @@ index 78fd4bd72b07f38b447840b584253883756fe021..6d8aaecc08207456f243125db8e6d7c7
3939
interface CertVerifierClient {
4040
Verify(
4141
int32 default_error,
42-
@@ -608,6 +627,8 @@ struct URLLoaderFactoryParams {
42+
@@ -633,6 +652,8 @@ struct URLLoaderFactoryParams {
4343
// interface. This still respects the per-context block lists.
4444
CorsOriginAccessPatterns? factory_bound_access_patterns;
4545

@@ -49,18 +49,18 @@ index 78fd4bd72b07f38b447840b584253883756fe021..6d8aaecc08207456f243125db8e6d7c7
4949
NetworkIsolationKey? network_isolation_key;
5050

5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index 6f69ca035500a7af795ccd93b689bcc3b376576e..bf112361de669c22532d269b5871c9b23ca7b694 100644
52+
index e8c902a95d23d785dad4d5920831337ad24c359c..dcb1421169062978b28ac0ea40f1fd63cc26c889 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
55-
@@ -338,6 +338,7 @@ URLLoader::URLLoader(
55+
@@ -483,6 +483,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
: url_request_context_(url_request_context),
6262
network_service_client_(network_service_client),
63-
@@ -396,6 +397,11 @@ URLLoader::URLLoader(
63+
@@ -545,6 +546,11 @@ URLLoader::URLLoader(
6464
header_client_.set_disconnect_handler(
6565
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
6666
}
@@ -72,7 +72,7 @@ index 6f69ca035500a7af795ccd93b689bcc3b376576e..bf112361de669c22532d269b5871c9b2
7272
if (want_raw_headers_) {
7373
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
7474
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
75-
@@ -830,7 +836,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
75+
@@ -980,7 +986,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 6f69ca035500a7af795ccd93b689bcc3b376576e..bf112361de669c22532d269b5871c9b2
8181
OnAuthCredentials(base::nullopt);
8282
return;
8383
}
84-
@@ -846,11 +852,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
84+
@@ -996,11 +1002,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;
@@ -108,18 +108,18 @@ index 6f69ca035500a7af795ccd93b689bcc3b376576e..bf112361de669c22532d269b5871c9b2
108108
auth_challenge_responder_receiver_.set_disconnect_handler(
109109
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
110110
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
111-
index 532ecdc0a9b386eb9ea04a480b18aeb1ac32a059..b3ad0f42ab9c2f513d8c4a06683d1af6f0219a56 100644
111+
index d2ebc94fdc3a6a7b73b89894427fa30ca6f45a20..5c39949e945b245becc1879b18123ee5628c299b 100644
112112
--- a/services/network/url_loader.h
113113
+++ b/services/network/url_loader.h
114-
@@ -85,6 +85,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
114+
@@ -104,6 +104,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
115115
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
116116
base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
117117
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
118118
+ mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
119119
mojom::OriginPolicyManager* origin_policy_manager);
120120
~URLLoader() override;
121121

122-
@@ -384,6 +385,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
122+
@@ -412,6 +413,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
123123
base::Optional<base::UnguessableToken> fetch_window_id_;
124124

125125
mojo::Remote<mojom::TrustedHeaderClient> header_client_;

‎patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: allow new privileges in unsandboxed child processes
66
This allows unsandboxed renderers to launch setuid processes on Linux.
77

88
diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
9-
index ea5258a03f83bcbda7bae296392a46cdd63d6fe1..14eed861e8828fd2ed7d8f27f9fd3bf180d04677 100644
9+
index e53e60ef146f8024e503f9ffad663a4d2dbc4f80..cee204cf6447c4b2a8cfd9c4ca257fe46af3e2e9 100644
1010
--- a/content/browser/child_process_launcher_helper_linux.cc
1111
+++ b/content/browser/child_process_launcher_helper_linux.cc
12-
@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
12+
@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
1313
const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
1414
options->fds_to_remap.push_back(
1515
std::make_pair(sandbox_fd, service_manager::GetSandboxFD()));

‎patches/chromium/blink_local_frame.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ 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 28d4c323a1c94ad61f83d4d9cc37863801f02276..85cb2f33afff53c8e524b04e398241928acf8305 100644
17+
index c58f6dded2c2cb0059a07fb2867f73be2a9727f3..38a0b88a26d6af97c9d9e22c8b40dc4d768e1f64 100644
1818
--- a/third_party/blink/renderer/core/frame/local_frame.cc
1919
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
20-
@@ -357,10 +357,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
20+
@@ -401,10 +401,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
2121
}
2222
CHECK(!view_ || !view_->IsAttached());
2323

@@ -28,7 +28,7 @@ index 28d4c323a1c94ad61f83d4d9cc37863801f02276..85cb2f33afff53c8e524b04e39824192
2828
if (!Client())
2929
return;
3030

31-
@@ -378,6 +374,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
31+
@@ -422,6 +418,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
3232
// Notify ScriptController that the frame is closing, since its cleanup ends
3333
// up calling back to LocalFrameClient via WindowProxy.
3434
GetScriptController().ClearForClose();

0 commit comments

Comments
 (0)