Changeset 83661 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

Apr 12, 2011, 4:27:37 PM (14 years ago)

Author:

[email protected]

Message:

2011-04-12 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Make API callback objects use weak handles to run their finalizers
​https://bugs.webkit.org/show_bug.cgi?id=58389

Make the API object's private data struct act as a finalizer for
an api object if the callback object has a API defined finalizer.

• API/JSCallbackObject.cpp: (JSC::JSCallbackObjectData::finalize):
• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: (JSC::::init):
• heap/Handle.h:

File:

• trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -89 +89 @@
         initialize(toRef(exec), toRef(this));
     }
-}
-
-template <class Base>
-JSCallbackObject<Base>::~JSCallbackObject()
-{
-    JSObjectRef thisRef = toRef(this);
-    
-    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectFinalizeCallback finalize = jsClass->finalize)
-            finalize(thisRef);
+
+    bool needsFinalizer = false;
+    for (JSClassRef jsClassPtr = classRef(); jsClassPtr && !needsFinalizer; jsClassPtr = jsClassPtr->parentClass)
+        needsFinalizer = jsClassPtr->finalize;
+    if (needsFinalizer) {
+        HandleSlot slot = exec->globalData().allocateGlobalHandle();
+        HandleHeap::heapFor(slot)->makeWeak(slot, m_callbackObjectData.get(), classRef());
+        HandleHeap::heapFor(slot)->writeBarrier(slot, this);
+        *slot = this;
+    }
 }