diff options
Diffstat (limited to 'src/base_object-inl.h')
-rw-r--r-- | src/base_object-inl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/base_object-inl.h b/src/base_object-inl.h index 786e1f26b4..3bd854639b 100644 --- a/src/base_object-inl.h +++ b/src/base_object-inl.h @@ -37,10 +37,13 @@ BaseObject::BaseObject(Environment* env, v8::Local<v8::Object> object) CHECK_EQ(false, object.IsEmpty()); CHECK_GT(object->InternalFieldCount(), 0); object->SetAlignedPointerInInternalField(0, static_cast<void*>(this)); + env_->AddCleanupHook(DeleteMe, static_cast<void*>(this)); } BaseObject::~BaseObject() { + env_->RemoveCleanupHook(DeleteMe, static_cast<void*>(this)); + if (persistent_handle_.IsEmpty()) { // This most likely happened because the weak callback below cleared it. return; @@ -80,6 +83,12 @@ T* BaseObject::FromJSObject(v8::Local<v8::Object> object) { } +void BaseObject::DeleteMe(void* data) { + BaseObject* self = static_cast<BaseObject*>(data); + delete self; +} + + void BaseObject::MakeWeak() { persistent_handle_.SetWeak( this, |