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

re-use request context from IOThread

Browse source
This commit is contained in:
deepak1556 2018-03-15 15:29:16 +09:00 • committed by Aleksei Kuzmin
parent 97fcf7079b
commit c3f8f6bc42
5 changed files with 20 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_main_parts.h
View file

@ -35,6 +35,8 @@ class BrowserMainParts : public content::BrowserMainParts {
BrowserMainParts();
~BrowserMainParts();
IOThread* io_thread() const { return io_thread_.get(); }
protected:
// content::BrowserMainParts:
void PreEarlyInitialization() override;

7
brightray/browser/io_thread.cc
View file

@ -8,6 +8,7 @@
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_context_getter.h"
#if defined(USE_NSS_CERTS)
#include "net/cert_net/nss_ocsp.h"
@ -28,8 +29,10 @@ IOThread::~IOThread() {
void IOThread::Init() {
net::URLRequestContextBuilder builder;
builder.set_proxy_service(net::ProxyService::CreateDirect());
builder.DisableHttpCache();
url_request_context_ = builder.Build();
url_request_context_getter_ = new net::TrivialURLRequestContextGetter(
url_request_context_.get(), base::ThreadTaskRunnerHandle::Get());
url_request_context_getter_->AddRef();
#if defined(USE_NSS_CERTS)
net::SetMessageLoopForNSSHttpIO();
@ -42,6 +45,8 @@ void IOThread::CleanUp() {
net::ShutdownNSSHttpIO();
net::SetURLRequestContextForNSSHttpIO(nullptr);
#endif
// Explicitly release before the IO thread gets destroyed.
url_request_context_getter_->Release();
url_request_context_.reset();
}

6
brightray/browser/io_thread.h
View file

@ -12,6 +12,7 @@
namespace net {
class URLRequestContext;
class URLRequestContextGetter;
}
namespace brightray {
@ -21,6 +22,10 @@ class IOThread : public content::BrowserThreadDelegate {
IOThread();
~IOThread() override;
net::URLRequestContextGetter* GetRequestContext() {
return url_request_context_getter_;
}
protected:
// BrowserThreadDelegate Implementation, runs on the IO thread.
void Init() override;
@ -28,6 +33,7 @@ class IOThread : public content::BrowserThreadDelegate {
private:
std::unique_ptr<net::URLRequestContext> url_request_context_;
net::URLRequestContextGetter* url_request_context_getter_;
DISALLOW_COPY_AND_ASSIGN(IOThread);
};