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

Remember isolate in Wrappable

Browse source
This commit is contained in:
Cheng Zhao 2015-06-23 17:08:52 +08:00
parent f310222ce1
commit 0586822808
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
native_mate/wrappable.cc
View file

@ -10,7 +10,7 @@
namespace mate { namespace mate {
Wrappable::Wrappable() { Wrappable::Wrappable() : isolate_(NULL) {
} }
Wrappable::~Wrappable() { Wrappable::~Wrappable() {
@ -21,6 +21,8 @@ void Wrappable::Wrap(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
if (!wrapper_.IsEmpty()) if (!wrapper_.IsEmpty())
return; return;
isolate_ = isolate;
MATE_SET_INTERNAL_FIELD_POINTER(wrapper, 0, this); MATE_SET_INTERNAL_FIELD_POINTER(wrapper, 0, this);
MATE_PERSISTENT_ASSIGN(v8::Object, isolate, wrapper_, wrapper); MATE_PERSISTENT_ASSIGN(v8::Object, isolate, wrapper_, wrapper);
MATE_PERSISTENT_SET_WEAK(wrapper_, this, WeakCallback); MATE_PERSISTENT_SET_WEAK(wrapper_, this, WeakCallback);

4
native_mate/wrappable.h
View file

@ -66,6 +66,9 @@ class Wrappable {
Wrappable(); Wrappable();
virtual ~Wrappable(); virtual ~Wrappable();
// Returns the Isolate this object is created in.
v8::Isolate* isolate() const { return isolate_; }
virtual ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate); virtual ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate);
// Called after the "_init" method gets called in JavaScript. // Called after the "_init" method gets called in JavaScript.
@ -74,6 +77,7 @@ class Wrappable {
private: private:
static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable); static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable);
v8::Isolate* isolate_;
v8::UniquePersistent<v8::Object> wrapper_; // Weak v8::UniquePersistent<v8::Object> wrapper_; // Weak
DISALLOW_COPY_AND_ASSIGN(Wrappable); DISALLOW_COPY_AND_ASSIGN(Wrappable);