Changeset 83661 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackObject.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/JSCallbackObject.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -35 +35 @@
 namespace JSC {
 
-struct JSCallbackObjectData {
+struct JSCallbackObjectData : WeakHandleOwner {
     JSCallbackObjectData(void* privateData, JSClassRef jsClass)
         : privateData(privateData)
@@ -111 +111 @@
     };
     OwnPtr<JSPrivatePropertyMap> m_privateProperties;
+    virtual void finalize(Handle<Unknown>, void*);
 };
 
@@ -119 +120 @@
     JSCallbackObject(ExecState*, JSGlobalObject*, NonNullPassRefPtr<Structure>, JSClassRef, void* data);
     JSCallbackObject(JSClassRef, NonNullPassRefPtr<Structure>);
-    virtual ~JSCallbackObject();
 
     void setPrivate(void* data);