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

Use the new SetWeak in Wrappable

Browse source
This commit is contained in:
Cheng Zhao 2015-08-27 15:50:38 +08:00
parent f5e34deb1a
commit 8ca005eb41
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
native_mate/wrappable.cc
View file

@ -14,7 +14,7 @@ Wrappable::Wrappable() : isolate_(NULL) {
}
Wrappable::~Wrappable() {
MATE_PERSISTENT_RESET(wrapper_);
wrapper_.Reset();
}
void Wrappable::Wrap(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
@ -23,14 +23,14 @@ void Wrappable::Wrap(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
isolate_ = isolate;
MATE_SET_INTERNAL_FIELD_POINTER(wrapper, 0, this);
MATE_PERSISTENT_ASSIGN(v8::Object, isolate, wrapper_, wrapper);
MATE_PERSISTENT_SET_WEAK(wrapper_, this, WeakCallback);
wrapper->SetAlignedPointerInInternalField(0, this);
wrapper_.Reset(isolate, wrapper);
wrapper_.SetWeak(this, FirstWeakCallback, v8::WeakCallbackType::kParameter);
// Call object._init if we have one.
v8::Local<v8::Function> init;
if (Dictionary(isolate, wrapper).Get("_init", &init))
init->Call(wrapper, 0, NULL);
init->Call(wrapper, 0, nullptr);
AfterInit(isolate);
}
@ -45,10 +45,16 @@ ObjectTemplateBuilder Wrappable::GetObjectTemplateBuilder(
return ObjectTemplateBuilder(isolate);
}
// static
MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) {
MATE_WEAK_CALLBACK_INIT(Wrappable);
delete self;
void Wrappable::FirstWeakCallback(const v8::WeakCallbackInfo<Wrappable>& data) {
Wrappable* wrappable = data.GetParameter();
wrappable->wrapper_.Reset();
data.SetSecondPassCallback(SecondWeakCallback);
}
void Wrappable::SecondWeakCallback(
const v8::WeakCallbackInfo<Wrappable>& data) {
Wrappable* wrappable = data.GetParameter();
delete wrappable;
}
v8::Local<v8::Object> Wrappable::GetWrapper(v8::Isolate* isolate) {
@ -59,7 +65,15 @@ v8::Local<v8::Object> Wrappable::GetWrapper(v8::Isolate* isolate) {
GetObjectTemplateBuilder(isolate).Build();
CHECK(!templ.IsEmpty());
CHECK_EQ(1, templ->InternalFieldCount());
v8::Local<v8::Object> wrapper = templ->NewInstance();
v8::Local<v8::Object> wrapper;
// |wrapper| may be empty in some extreme cases, e.g., when
// Object.prototype.constructor is overwritten.
if (!templ->NewInstance(isolate->GetCurrentContext()).ToLocal(&wrapper)) {
// The current wrappable object will be no longer managed by V8. Delete this
// now.
delete this;
return wrapper;
}
Wrap(isolate, wrapper);
return wrapper;
}

3
native_mate/wrappable.h
View file

@ -79,7 +79,8 @@ class Wrappable {
virtual void AfterInit(v8::Isolate* isolate) {}
private:
static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable);
static void FirstWeakCallback(const v8::WeakCallbackInfo<Wrappable>& data);
static void SecondWeakCallback(const v8::WeakCallbackInfo<Wrappable>& data);
v8::Isolate* isolate_;
v8::UniquePersistent<v8::Object> wrapper_; // Weak