Changeset 86498 in webkit

Timestamp:

May 14, 2011 2:44:33 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-05-14 Oliver Hunt <​oliver@apple.com>

Reviewed by Anders Carlsson.

Make Qt bindings GC safe
​https://bugs.webkit.org/show_bug.cgi?id=60841

Trying to do cache management by using "this" as a key from a GC
object's destructor leads to a violation of GC semantics. Make
the qt bindings use a Weak<> handle for finalization.

• bridge/qt/qt_runtime.cpp: (JSC::Bindings::QtRuntimeMethod::QtRuntimeMethod): (JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod):
• bridge/qt/qt_runtime.h: (JSC::Bindings::QtRuntimeMethodData::finalize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/qt/qt_runtime.cpp (modified) (2 diffs)
• bridge/qt/qt_runtime.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-14  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Make Qt bindings GC safe
+        https://bugs.webkit.org/show_bug.cgi?id=60841
+
+        Trying to do cache management by using "this" as a key from a GC
+        object's destructor leads to a violation of GC semantics.  Make
+        the qt bindings use a Weak<> handle for finalization.
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::QtRuntimeMethod::QtRuntimeMethod):
+        (JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod):
+        * bridge/qt/qt_runtime.h:
+        (JSC::Bindings::QtRuntimeMethodData::finalize):
+
 2011-05-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/bridge/qt/qt_runtime.cpp

@@ -988 +988 @@
     QW_D(QtRuntimeMethod);
     d->m_instance = inst;
+    d->m_finalizer.set(exec->globalData(), this, d);
 }
 
 QtRuntimeMethod::~QtRuntimeMethod()
 {
-    QW_D(QtRuntimeMethod);
-    d->m_instance->removeCachedMethod(this);
     delete d_ptr;
 }
@@ -1001 +1000 @@
 QtRuntimeMethodData::~QtRuntimeMethodData()
 {
+}
+
+void QtRuntimeMethodData::finalize(Handle<Unknown> value, void*)
+{
+    m_instance->removeCachedMethod(static_cast<JSObject*>(value.get().asCell()));
 }
 

trunk/Source/WebCore/bridge/qt/qt_runtime.h

@@ -24 +24 @@
 #include "Completion.h"
 #include "Strong.h"
+#include "Weak.h"
 #include "runtime_method.h"
 
@@ -116 +117 @@
 
 // Extra data classes (to avoid the CELL_SIZE limit on JS objects)
-
-class QtRuntimeMethodData {
+class QtRuntimeMethod;
+class QtRuntimeMethodData : public WeakHandleOwner {
     public:
         virtual ~QtRuntimeMethodData();
         RefPtr<QtInstance> m_instance;
+        Weak<QtRuntimeMethod> m_finalizer;
+
+    private:
+        void finalize(Handle<Unknown>, void*);
 };