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

get jsprotocolhandler in IO thread

Browse source
This commit is contained in:
Robo 2015-07-22 21:54:12 +05:30
parent a1ec07e07e
commit 97c90d31d3
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,16 +80,13 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
registry_(registry) { registry_(registry) {
} }
// AdapterRequestJob: void GetJobTypeInUI(const Protocol::JsProtocolHandler& callback) {
void GetJobTypeInUI() override {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
v8::Locker locker(registry_->isolate()); v8::Locker locker(registry_->isolate());
v8::HandleScope handle_scope(registry_->isolate()); v8::HandleScope handle_scope(registry_->isolate());
// Call the JS handler. // Call the JS handler.
Protocol::JsProtocolHandler callback =
registry_->GetProtocolHandler(request()->url().scheme());
v8::Local<v8::Value> result = callback.Run(request()); v8::Local<v8::Value> result = callback.Run(request());
// Determine the type of the job we are going to create. // Determine the type of the job we are going to create.
@ -172,6 +169,14 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
GetWeakPtr(), net::ERR_NOT_IMPLEMENTED)); GetWeakPtr(), net::ERR_NOT_IMPLEMENTED));
} }
// AdapterRequestJob:
void GetJobType() override {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(&CustomProtocolRequestJob::GetJobTypeInUI,
base::Unretained(this),
registry_->GetProtocolHandler(request()->url().scheme())));
}
private: private:
Protocol* registry_; // Weak, the Protocol class is expected to live forever. Protocol* registry_; // Weak, the Protocol class is expected to live forever.
}; };

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

@ -27,11 +27,7 @@ AdapterRequestJob::AdapterRequestJob(ProtocolHandler* protocol_handler,
void AdapterRequestJob::Start() { void AdapterRequestJob::Start() {
DCHECK(!real_job_.get()); DCHECK(!real_job_.get());
content::BrowserThread::PostTask( GetJobType();
content::BrowserThread::UI,
FROM_HERE,
base::Bind(&AdapterRequestJob::GetJobTypeInUI,
weak_factory_.GetWeakPtr()));
} }
void AdapterRequestJob::Kill() { void AdapterRequestJob::Kill() {

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

@ -54,7 +54,7 @@ class AdapterRequestJob : public net::URLRequestJob {
ProtocolHandler* default_protocol_handler() { return protocol_handler_; } ProtocolHandler* default_protocol_handler() { return protocol_handler_; }
// Override this function to determine which job should be started. // Override this function to determine which job should be started.
virtual void GetJobTypeInUI() = 0; virtual void GetJobType() = 0;
void CreateErrorJobAndStart(int error_code); void CreateErrorJobAndStart(int error_code);
void CreateStringJobAndStart(const std::string& mime_type, void CreateStringJobAndStart(const std::string& mime_type,