github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick fix from chromium issue 1113227 (#24997)

Browse Source
This commit is contained in:
Daniel White
2020-08-18 00:58:19 -04:00
committed by GitHub
parent 358d6e1116
commit cf321a9b55
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -118,3 +118,4 @@ backport_1016278.patch
backport_1042986.patch
a11y_axplatformnodebase_getindexinparent_returns_base_optional.patch
worker_feat_add_hook_to_notify_script_ready.patch
reconnect_p2p_socket_dispatcher_if_network_service_dies.patch

47
patches/chromium/reconnect_p2p_socket_dispatcher_if_network_service_dies.patch Normal file
View File

@@ -0,0 +1,47 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Taylor Brandstetter <deadbeef@chromium.org>
Date: Wed, 12 Aug 2020 05:24:50 +0000
Subject: Reconnect P2P socket dispatcher if network service dies.
Bug: chromium:1113227
Change-Id: Ifc8e856fde4cf4eee25149f0a1e86a3cad71ea83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2344747
Commit-Queue: Taylor <deadbeef@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797125}
diff --git a/third_party/blink/renderer/platform/p2p/socket_dispatcher.cc b/third_party/blink/renderer/platform/p2p/socket_dispatcher.cc
index 6c3adda46f77bc15d7d1998871b0daeb34780a77..29884a255f24556f4dc8b41b22304938a4f0d775 100644
--- a/third_party/blink/renderer/platform/p2p/socket_dispatcher.cc
+++ b/third_party/blink/renderer/platform/p2p/socket_dispatcher.cc
@@ -110,6 +110,18 @@ void P2PSocketDispatcher::RequestNetworkEventsIfNecessary() {
void P2PSocketDispatcher::OnConnectionError() {
base::AutoLock lock(p2p_socket_manager_lock_);
p2p_socket_manager_.reset();
+ // Attempt to reconnect in case the network service crashed in his being
+ // restarted.
+ PostCrossThreadTask(
+ *main_task_runner_.get(), FROM_HERE,
+ CrossThreadBindOnce(&P2PSocketDispatcher::ReconnectP2PSocketManager,
+ scoped_refptr<P2PSocketDispatcher>(this)));
+}
+
+void P2PSocketDispatcher::ReconnectP2PSocketManager() {
+ network_notification_client_receiver_.reset();
+ GetP2PSocketManager()->StartNetworkNotifications(
+ network_notification_client_receiver_.BindNewPipeAndPassRemote());
}
} // namespace blink
diff --git a/third_party/blink/renderer/platform/p2p/socket_dispatcher.h b/third_party/blink/renderer/platform/p2p/socket_dispatcher.h
index de9b6690e0b27d3c4a263e8f908c0a95a675a089..c250d2af99d5291f34a7e3bfdb63fcbb70a5bd73 100644
--- a/third_party/blink/renderer/platform/p2p/socket_dispatcher.h
+++ b/third_party/blink/renderer/platform/p2p/socket_dispatcher.h
@@ -83,6 +83,7 @@ class PLATFORM_EXPORT P2PSocketDispatcher
void RequestNetworkEventsIfNecessary();
void OnConnectionError();
+ void ReconnectP2PSocketManager();
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;