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

Merge pull request #6832 from hammerandchisel/bug/remote_object_freer_crash

Browse source 
fix intermittent crash in RemoteObjectFreer
This commit is contained in:
Cheng Zhao 2016-08-17 20:31:06 +09:00 • committed by GitHub
commit bd03ae53f2
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/common/api/remote_object_freer.cc
View file

@ -41,14 +41,20 @@ void RemoteObjectFreer::BindTo(
RemoteObjectFreer::RemoteObjectFreer( RemoteObjectFreer::RemoteObjectFreer(
v8::Isolate* isolate, v8::Local<v8::Object> target, int object_id) v8::Isolate* isolate, v8::Local<v8::Object> target, int object_id)
: ObjectLifeMonitor(isolate, target), : ObjectLifeMonitor(isolate, target),
object_id_(object_id) { object_id_(object_id),
routing_id_(MSG_ROUTING_NONE) {
content::RenderView* render_view = GetCurrentRenderView();
if (render_view) {
routing_id_ = render_view->GetRoutingID();
}
} }
RemoteObjectFreer::~RemoteObjectFreer() { RemoteObjectFreer::~RemoteObjectFreer() {
} }
void RemoteObjectFreer::RunDestructor() { void RemoteObjectFreer::RunDestructor() {
content::RenderView* render_view = GetCurrentRenderView(); content::RenderView* render_view =
content::RenderView::FromRoutingID(routing_id_);
if (!render_view) if (!render_view)
return; return;

1
atom/common/api/remote_object_freer.h
View file

@ -23,6 +23,7 @@ class RemoteObjectFreer : public ObjectLifeMonitor {
private: private:
int object_id_; int object_id_;
int routing_id_;
DISALLOW_COPY_AND_ASSIGN(RemoteObjectFreer); DISALLOW_COPY_AND_ASSIGN(RemoteObjectFreer);
}; };