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

Don't reset handle before Wrappable is destroyed

Browse source 
It is possible that the user wants to use the V8 object in the destructor.

Fixes atom/atom-shell#1112.
This commit is contained in:
Cheng Zhao 2015-03-23 16:19:55 +08:00
parent 38aba07290
commit 40da835cbb
6 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
native_mate/constructor.h
View file

@ -176,7 +176,7 @@ class Constructor {
} }
base::StringPiece name_; base::StringPiece name_;
v8::Persistent<v8::FunctionTemplate> constructor_; v8::UniquePersistent<v8::FunctionTemplate> constructor_;
DISALLOW_COPY_AND_ASSIGN(Constructor); DISALLOW_COPY_AND_ASSIGN(Constructor);
}; };

2
native_mate/constructor.h.pump
View file

@ -112,7 +112,7 @@ class Constructor {
} }
base::StringPiece name_; base::StringPiece name_;
v8::Persistent<v8::FunctionTemplate> constructor_; v8::UniquePersistent<v8::FunctionTemplate> constructor_;
DISALLOW_COPY_AND_ASSIGN(Constructor); DISALLOW_COPY_AND_ASSIGN(Constructor);
}; };

2
native_mate/function_template.h
View file

@ -57,7 +57,7 @@ class CallbackHolderBase {
private: private:
static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase); static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase);
v8::Persistent<v8::External> v8_ref_; v8::UniquePersistent<v8::External> v8_ref_;
DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase); DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase);
}; };

2
native_mate/function_template.h.pump
View file

@ -60,7 +60,7 @@ class CallbackHolderBase {
private: private:
static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase); static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase);
v8::Persistent<v8::External> v8_ref_; v8::UniquePersistent<v8::External> v8_ref_;
DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase); DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase);
}; };

1
native_mate/wrappable.cc
View file

@ -46,7 +46,6 @@ ObjectTemplateBuilder Wrappable::GetObjectTemplateBuilder(
// static // static
MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) { MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) {
MATE_WEAK_CALLBACK_INIT(Wrappable); MATE_WEAK_CALLBACK_INIT(Wrappable);
MATE_PERSISTENT_RESET(self->wrapper_);
delete self; delete self;
} }

2
native_mate/wrappable.h
View file

@ -74,7 +74,7 @@ class Wrappable {
private: private:
static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable); static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable);
v8::Persistent<v8::Object> wrapper_; // Weak v8::UniquePersistent<v8::Object> wrapper_; // Weak
DISALLOW_COPY_AND_ASSIGN(Wrappable); DISALLOW_COPY_AND_ASSIGN(Wrappable);
}; };