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

Pass net::URLRequestContextGetter in scoped_refptr

Browse source
This commit is contained in:
Cheng Zhao 2015-08-10 15:28:18 +08:00
parent c295979270
commit 0644129fbe
7 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

38
atom/browser/api/atom_api_protocol.cc
View file

@ -35,23 +35,6 @@ struct Converter<const net::URLRequest*> {
}
};
template<>
struct Converter<net::URLRequestContextGetter*> {
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
net::URLRequestContextGetter** out) {
if (val->IsNull()) {
*out = nullptr;
return true;
}
atom::api::Session* session;
if (!Converter<atom::api::Session*>::FromV8(isolate, val, &session))
return false;
*out = session->browser_context()->GetRequestContext();
return true;
}
};
} // namespace mate
namespace atom {
@ -141,16 +124,27 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
} else if (name == "RequestHttpJob") {
GURL url;
std::string method, referrer;
net::URLRequestContextGetter* getter =
registry_->browser_context()->GetRequestContext();
dict.Get("url", &url);
dict.Get("method", &method);
dict.Get("referrer", &referrer);
dict.Get("session", &getter);
v8::Local<v8::Value> value;
mate::Handle<Session> session;
scoped_refptr<net::URLRequestContextGetter> request_context_getter;
// "session" null -> pass nullptr;
// "session" a Session object -> use passed session.
// "session" undefined -> use current session;
if (dict.Get("session", &session))
request_context_getter =
session->browser_context()->GetRequestContext();
else if (dict.Get("session", &value) && value->IsNull())
request_context_getter = nullptr;
else
request_context_getter = registry_->request_context_getter();
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&AdapterRequestJob::CreateHttpJobAndStart, GetWeakPtr(),
base::Unretained(getter), url, method, referrer));
request_context_getter, url, method, referrer));
return;
}
}
@ -237,7 +231,7 @@ std::string ConvertErrorCode(int error_code) {
} // namespace
Protocol::Protocol(AtomBrowserContext* browser_context)
: browser_context_(browser_context),
: request_context_getter_(browser_context->GetRequestContext()),
job_factory_(browser_context->job_factory()) {
CHECK(job_factory_);
}

8
atom/browser/api/atom_api_protocol.h
View file

@ -16,6 +16,7 @@
namespace net {
class URLRequest;
class URLRequestContextGetter;
}
namespace atom {
@ -46,7 +47,9 @@ class Protocol : public mate::EventEmitter {
JsProtocolHandler GetProtocolHandler(const std::string& scheme);
AtomBrowserContext* browser_context() const { return browser_context_; }
net::URLRequestContextGetter* request_context_getter() {
return request_context_getter_.get();
}
protected:
explicit Protocol(AtomBrowserContext* browser_context);
@ -94,7 +97,8 @@ class Protocol : public mate::EventEmitter {
const JsProtocolHandler& handler);
int UninterceptProtocolInIO(const std::string& scheme);
AtomBrowserContext* browser_context_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
AtomURLRequestJobFactory* job_factory_;
ProtocolHandlersMap protocol_handlers_;

8
atom/browser/api/atom_api_session.h
View file

@ -13,14 +13,14 @@
class GURL;
namespace mate {
class Arguments;
}
namespace base {
class FilePath;
}
namespace mate {
class Arguments;
}
namespace atom {
class AtomBrowserContext;

2
atom/browser/net/adapter_request_job.cc
View file

@ -119,7 +119,7 @@ void AdapterRequestJob::CreateFileJobAndStart(const base::FilePath& path) {
}
void AdapterRequestJob::CreateHttpJobAndStart(
net::URLRequestContextGetter* request_context_getter,
scoped_refptr<net::URLRequestContextGetter> request_context_getter,
const GURL& url,
const std::string& method,
const std::string& referrer) {

2
atom/browser/net/adapter_request_job.h
View file

@ -65,7 +65,7 @@ class AdapterRequestJob : public net::URLRequestJob {
scoped_refptr<base::RefCountedBytes> data);
void CreateFileJobAndStart(const base::FilePath& path);
void CreateHttpJobAndStart(
net::URLRequestContextGetter* request_context_getter,
scoped_refptr<net::URLRequestContextGetter> request_context_getter,
const GURL& url,
const std::string& method,
const std::string& referrer);

4
atom/browser/net/url_request_fetch_job.cc
View file

@ -75,7 +75,7 @@ class ResponsePiper : public net::URLFetcherResponseWriter {
} // namespace
URLRequestFetchJob::URLRequestFetchJob(
net::URLRequestContextGetter* request_context_getter,
scoped_refptr<net::URLRequestContextGetter> request_context_getter,
net::URLRequest* request,
net::NetworkDelegate* network_delegate,
const GURL& url,
@ -93,7 +93,7 @@ URLRequestFetchJob::URLRequestFetchJob(
fetcher_.reset(net::URLFetcher::Create(url, request_type, this));
// Use request context if provided else create one.
if (request_context_getter)
fetcher_->SetRequestContext(request_context_getter);
fetcher_->SetRequestContext(request_context_getter.get());
else
fetcher_->SetRequestContext(GetRequestContext());

2
atom/browser/net/url_request_fetch_job.h
View file

@ -18,7 +18,7 @@ class AtomBrowserContext;
class URLRequestFetchJob : public net::URLRequestJob,
public net::URLFetcherDelegate {
public:
URLRequestFetchJob(net::URLRequestContextGetter* request_context_getter,
URLRequestFetchJob(scoped_refptr<net::URLRequestContextGetter> context_getter,
net::URLRequest* request,
net::NetworkDelegate* network_delegate,
const GURL& url,