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

Merge pull request #3903 from atom/fix-webrequest-crash

Browse source 
Fix crash when using webRequest API
This commit is contained in:
Cheng Zhao 2015-12-23 10:44:19 +08:00
commit a1936ecf82
2 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
atom/browser/net/atom_network_delegate.cc
View file

@ -185,28 +185,6 @@ void ReadFromResponseObject(const base::DictionaryValue& response,
}
}
// Deal with the results of Listener.
template<typename T>
void OnListenerResultInIO(const net::CompletionCallback& callback,
T out,
scoped_ptr<base::DictionaryValue> response) {
ReadFromResponseObject(*response.get(), out);
bool cancel = false;
response->GetBoolean("cancel", &cancel);
callback.Run(cancel ? net::ERR_BLOCKED_BY_CLIENT : net::OK);
}
template<typename T>
void OnListenerResultInUI(const net::CompletionCallback& callback,
T out,
const base::DictionaryValue& response) {
scoped_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(OnListenerResultInIO<T>, callback, out, base::Passed(&copy)));
}
} // namespace
AtomNetworkDelegate::AtomNetworkDelegate() {
@ -309,13 +287,13 @@ void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
}
void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
// OnCompleted may happen before other events.
callbacks_.erase(request->identifier());
if (request->status().status() == net::URLRequestStatus::FAILED ||
request->status().status() == net::URLRequestStatus::CANCELED) {
// Error event.
if (ContainsKey(simple_listeners_, kOnErrorOccurred))
OnErrorOccurred(request);
else
brightray::NetworkDelegate::OnCompleted(request, started);
OnErrorOccurred(request, started);
return;
} else if (request->response_headers() &&
net::HttpResponseHeaders::IsRedirectResponseCode(
@ -334,7 +312,17 @@ void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
request->was_cached());
}
void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request) {
void AtomNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
callbacks_.erase(request->identifier());
}
void AtomNetworkDelegate::OnErrorOccurred(
net::URLRequest* request, bool started) {
if (!ContainsKey(simple_listeners_, kOnErrorOccurred)) {
brightray::NetworkDelegate::OnCompleted(request, started);
return;
}
HandleSimpleEvent(kOnErrorOccurred, request, request->was_cached(),
request->status());
}
@ -353,8 +341,12 @@ int AtomNetworkDelegate::HandleResponseEvent(
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
FillDetailsObject(details.get(), request, args...);
// The |request| could be destroyed before the |callback| is called.
callbacks_[request->identifier()] = callback;
ResponseCallback response =
base::Bind(OnListenerResultInUI<Out>, callback, out);
base::Bind(&AtomNetworkDelegate::OnListenerResultInUI<Out>,
base::Unretained(this), request->identifier(), out);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(RunResponseListener, info.listener, base::Passed(&details),
@ -377,4 +369,28 @@ void AtomNetworkDelegate::HandleSimpleEvent(
base::Bind(RunSimpleListener, info.listener, base::Passed(&details)));
}
template<typename T>
void AtomNetworkDelegate::OnListenerResultInIO(
uint64_t id, T out, scoped_ptr<base::DictionaryValue> response) {
// The request has been destroyed.
if (!ContainsKey(callbacks_, id))
return;
ReadFromResponseObject(*response.get(), out);
bool cancel = false;
response->GetBoolean("cancel", &cancel);
callbacks_[id].Run(cancel ? net::ERR_BLOCKED_BY_CLIENT : net::OK);
}
template<typename T>
void AtomNetworkDelegate::OnListenerResultInUI(
uint64_t id, T out, const base::DictionaryValue& response) {
scoped_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&AtomNetworkDelegate::OnListenerResultInIO<T>,
base::Unretained(this), id, out, base::Passed(&copy)));
}
} // namespace atom

16
atom/browser/net/atom_network_delegate.h
View file

@ -85,10 +85,11 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
const GURL& new_location) override;
void OnResponseStarted(net::URLRequest* request) override;
void OnCompleted(net::URLRequest* request, bool started) override;
void OnErrorOccurred(net::URLRequest* request);
void OnURLRequestDestroyed(net::URLRequest* request) override;
private:
void OnErrorOccurred(net::URLRequest* request, bool started);
template<typename...Args>
void HandleSimpleEvent(SimpleEvent type,
net::URLRequest* request,
@ -100,8 +101,17 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
Out out,
Args... args);
// Deal with the results of Listener.
template<typename T>
void OnListenerResultInIO(
uint64_t id, T out, scoped_ptr<base::DictionaryValue> response);
template<typename T>
void OnListenerResultInUI(
uint64_t id, T out, const base::DictionaryValue& response);
std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;;
std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
std::map<uint64_t, net::CompletionCallback> callbacks_;
DISALLOW_COPY_AND_ASSIGN(AtomNetworkDelegate);
};