mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 2a7aff41ce73adc0eeee67d364989 (master) (#18505)

Browse source 
* chore: bump chromium in DEPS to 07463d3cd628b037c11f36022cb4c788db4628e3

* chore: update patches

* fix: Don't leak system network context when nw service is disabled

1632494
NetworkService is now deleted by using SequnceLocalStorageSlot
on the IO thread when the service is disabled, which expects
all associated NetworkContexts on that sequence to be destroyed.

* chore: bump chromium in DEPS to 7c16850e7e40990e141f47101b737ec1092175a1

* fix: Destroy all network contexts before primary network context

* Simplify out-of-process service registration

1615882

* [ThreadPool] Rename base::ThreadPool to base::ThreadPoolInstance

1634851

* chore: update patches

* fix: -Winconsistent-missing-override warnings

* chore: bump chromium in DEPS to 93ebfaccc12715df1d5426797998eed0932f7ae1

* Change CreateBrowserMainParts to return unique_ptrs

1632532

* chore: update patches

* chore: bump chromium in DEPS to e656555ffb87bdd05e248d0a3ef9dd9d3433e17b

* chore: bump chromium in DEPS to 111e7a8d2e3ae9d70e535009d6afb066ac906063

* chore: bump chromium in DEPS to 9b6b84670d32a7aff41ce73adc0eeee67d364989

* chore: update patches

* chore: remove ShouldInterceptResourceAsStream as it is removed upstream

Refs: 1639597

* chore: remove ResourceDispatcherHostCreated as it is removed upstream

Refs: 1610892

* chore: CreateWithStrongBinding --> CreateWithSelfOwnedReceiver

Refs: 1636722

* chore: rename all blink media enums

Refs: 1639237

* chore: add accidentally removed patch content back
This commit is contained in:
Electron Bot 2019-06-03 20:44:12 -07:00 • committed by Samuel Attard
parent 641e1d6587
commit d008d217f9
61 changed files with 268 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/io_thread.h
View file

@ -6,12 +6,18 @@
#define ATOM_BROWSER_IO_THREAD_H_
#include <memory>
#include <set>
#include "atom/browser/net/system_network_context_manager.h"
#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "content/public/browser/browser_thread_delegate.h"
#include "services/network/public/mojom/network_service.mojom.h"
namespace atom {
class URLRequestContextGetter;
}
namespace net {
class URLRequestContext;
}
@ -27,6 +33,9 @@ class IOThread : public content::BrowserThreadDelegate {
SystemNetworkContextManager* system_network_context_manager);
~IOThread() override;
void RegisterURLRequestContextGetter(atom::URLRequestContextGetter* getter);
void DeregisterURLRequestContextGetter(atom::URLRequestContextGetter* getter);
protected:
// BrowserThreadDelegate Implementation, runs on the IO thread.
void Init() override;
@ -39,13 +48,7 @@ class IOThread : public content::BrowserThreadDelegate {
// When the network service is disabled, this holds on to a
// content::NetworkContext class that owns |system_request_context_|.
// TODO(deepak1556): primary network context has to be destroyed after
// other active contexts, but since the ownership of latter is not released
// before IO thread is destroyed, it results in a DCHECK failure.
// We leak the reference to primary context to workaround this issue,
// since there is only one instance for the entire lifetime of app, it is
// safe.
network::mojom::NetworkContext* system_network_context_;
std::unique_ptr<network::mojom::NetworkContext> system_network_context_;
net::URLRequestContext* system_request_context_;
// These are set on the UI thread, and then consumed during initialization on
@ -59,6 +62,13 @@ class IOThread : public content::BrowserThreadDelegate {
network::mojom::HttpAuthStaticParamsPtr http_auth_static_params_;
network::mojom::HttpAuthDynamicParamsPtr http_auth_dynamic_params_;
// |lock_| protects access to |request_context_getters_|.
base::Lock lock_;
// List of all request contexts that needs to be notified when
// IO thread is shutting down.
std::set<atom::URLRequestContextGetter*> request_context_getters_;
DISALLOW_COPY_AND_ASSIGN(IOThread);
};