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

Do not wrap an object when it's already wrapped.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-22 15:57:23 +08:00
parent d950fe3736
commit 3d219b4be6
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
native_mate/wrappable.cc
View file

@ -17,6 +17,9 @@ Wrappable::~Wrappable() {
} }
void Wrappable::Wrap(v8::Isolate* isolate, v8::Handle<v8::Object> wrapper) { void Wrappable::Wrap(v8::Isolate* isolate, v8::Handle<v8::Object> wrapper) {
if (!wrapper_.IsEmpty())
return;
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);
@ -40,9 +43,8 @@ MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) {
} }
v8::Handle<v8::Object> Wrappable::GetWrapper(v8::Isolate* isolate) { v8::Handle<v8::Object> Wrappable::GetWrapper(v8::Isolate* isolate) {
if (!wrapper_.IsEmpty()) { if (!wrapper_.IsEmpty())
return MATE_PERSISTENT_TO_LOCAL(v8::Object, isolate, wrapper_); return MATE_PERSISTENT_TO_LOCAL(v8::Object, isolate, wrapper_);
}
v8::Local<v8::ObjectTemplate> templ = v8::Local<v8::ObjectTemplate> templ =
GetObjectTemplateBuilder(isolate).Build(); GetObjectTemplateBuilder(isolate).Build();