Index: Source/bindings/core/v8/ScriptWrappable.cpp |
diff --git a/Source/bindings/core/v8/ScriptWrappable.cpp b/Source/bindings/core/v8/ScriptWrappable.cpp |
index a2607fb76152f26c46a5d19b31e2c91fa85c92f4..7a30961f58cd8e260b443d4e8b1f2da8159517e6 100644 |
--- a/Source/bindings/core/v8/ScriptWrappable.cpp |
+++ b/Source/bindings/core/v8/ScriptWrappable.cpp |
@@ -51,6 +51,12 @@ v8::Local<v8::Object> ScriptWrappable::wrap(v8::Isolate* isolate, v8::Local<v8:: |
ASSERT(!DOMDataStore::containsWrapper(this, isolate)); |
v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperTypeInfo, this); |
+ // V8DOMWrapper::createWrapper may run an arbitrary script and it may result |
+ // in creating a new wrapper and associating it with |this|. If so, the |
+ // wrapper already created and associated must be used. |
+ v8::Local<v8::Object> associatedWrapper = DOMDataStore::getWrapper(this, isolate); |
+ if (UNLIKELY(!associatedWrapper.IsEmpty())) |
+ return associatedWrapper; |
if (UNLIKELY(wrapper.IsEmpty())) |
return wrapper; |