Changeset 62763 in webkit

Timestamp:

Jul 7, 2010 11:23:51 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Nate Chapin.

[V8] Fix document wrapper memory leak in bindings.
​https://bugs.webkit.org/show_bug.cgi?id=41771

• bindings/v8/custom/V8HTMLDocumentCustom.cpp: (WebCore::V8HTMLDocument::WrapInShadowObject): Do not create static persistent handle to shadowConstructor because it keeps the first context alive forever.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8HTMLDocumentCustom.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [V8] Fix document wrapper memory leak in bindings.
+        https://bugs.webkit.org/show_bug.cgi?id=41771
+
+        * bindings/v8/custom/V8HTMLDocumentCustom.cpp:
+        (WebCore::V8HTMLDocument::WrapInShadowObject): Do not create static persistent handle
+        to shadowConstructor because it keeps the first context alive forever.
+
 2010-07-07  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp

@@ -52 +52 @@
 v8::Local<v8::Object> V8HTMLDocument::WrapInShadowObject(v8::Local<v8::Object> wrapper, Node* impl)
 {
-    DEFINE_STATIC_LOCAL(v8::Persistent<v8::Function>, shadowConstructor, ());
-    if (shadowConstructor.IsEmpty()) {
-        v8::Local<v8::FunctionTemplate> shadowTemplate = v8::FunctionTemplate::New();
+    DEFINE_STATIC_LOCAL(v8::Persistent<v8::FunctionTemplate>, shadowTemplate, ());
+    if (shadowTemplate.IsEmpty()) {
+        shadowTemplate = v8::Persistent<v8::FunctionTemplate>::New(v8::FunctionTemplate::New());
         if (shadowTemplate.IsEmpty())
             return v8::Local<v8::Object>();
@@ -60 +60 @@
         shadowTemplate->Inherit(V8HTMLDocument::GetTemplate());
         shadowTemplate->InstanceTemplate()->SetInternalFieldCount(V8HTMLDocument::internalFieldCount);
-        shadowConstructor = v8::Persistent<v8::Function>::New(shadowTemplate->GetFunction());
-        if (shadowConstructor.IsEmpty())
-            return v8::Local<v8::Object>();
     }
 
-    ASSERT(!shadowConstructor.IsEmpty());
+    v8::Local<v8::Function> shadowConstructor = shadowTemplate->GetFunction();
+    if (shadowConstructor.IsEmpty())
+        return v8::Local<v8::Object>();
+
     v8::Local<v8::Object> shadow = shadowConstructor->NewInstance();
     if (shadow.IsEmpty())