Changeset 84286 in webkit

Timestamp:

Apr 19, 2011 1:40:31 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-19 Oliver Hunt <​oliver@apple.com>

Reviewed by Andreas Kling.

[Qt] QtInstance method cache ownership rules are unclear
​https://bugs.webkit.org/show_bug.cgi?id=58820

Make the QtInstance method cache use WriteBarrier, and handle
ownership properly.

• bridge/qt/qt_class.cpp: (JSC::Bindings::QtClass::fallbackObject): (JSC::Bindings::QtClass::fieldNamed):
• bridge/qt/qt_instance.cpp: (JSC::Bindings::QtInstance::~QtInstance): (JSC::Bindings::QtInstance::removeCachedMethod): (JSC::Bindings::QtInstance::newRuntimeObject): (JSC::Bindings::QtInstance::markAggregate):
• bridge/qt/qt_instance.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtInstance method cache ownership rules are unclear
+        https://bugs.webkit.org/show_bug.cgi?id=58820
+
+        Make the QtInstance method cache use WriteBarrier, and handle
+        ownership properly.
+
+        * bridge/qt/qt_class.cpp:
+        (JSC::Bindings::QtClass::fallbackObject):
+        (JSC::Bindings::QtClass::fieldNamed):
+        * bridge/qt/qt_instance.cpp:
+        (JSC::Bindings::QtInstance::~QtInstance):
+        (JSC::Bindings::QtInstance::removeCachedMethod):
+        (JSC::Bindings::QtInstance::newRuntimeObject):
+        (JSC::Bindings::QtInstance::markAggregate):
+        * bridge/qt/qt_instance.h:
+
 2011-04-19  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -88 +88 @@
         if (m.access() != QMetaMethod::Private) {
             QtRuntimeMetaMethod* val = new (exec) QtRuntimeMetaMethod(exec, identifier, static_cast<QtInstance*>(inst), index, normal, false);
-            qtinst->m_methods.insert(name, val);
+            qtinst->m_methods.insert(name, WriteBarrier<JSObject>(exec->globalData(), qtinst->createRuntimeObject(exec), val));
             return val;
         }
@@ -107 +107 @@
         if (normal == QByteArray::fromRawData(signature, iter)) {
             QtRuntimeMetaMethod* val = new (exec) QtRuntimeMetaMethod(exec, identifier, static_cast<QtInstance*>(inst), index, normal, false);
-            qtinst->m_methods.insert(name, val);
+            qtinst->m_methods.insert(name, WriteBarrier<JSObject>(exec->globalData(), qtinst->createRuntimeObject(exec), val));
             return val;
         }

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

@@ -152 +152 @@
         m_defaultMethod.clear();
 
-    for (QHash<QByteArray, DeprecatedPtr<JSObject> >::Iterator it = m_methods.begin(),
-        end = m_methods.end(); it != end; ++it)
+    for (QHash<QByteArray, WriteBarrier<JSObject> >::Iterator it = m_methods.begin(), end = m_methods.end(); it != end; ++it) {
         if (it.value().get() == method) {
             m_methods.erase(it);
             return;
         }
+    }
 }
 
@@ -190 +190 @@
     if (m_defaultMethod)
         markStack.append(&m_defaultMethod);
-    foreach (DeprecatedPtr<JSObject> val, m_methods.values()) {
-        if (val)
-            markStack.append(&val);
-    }
+    for (QHash<QByteArray, WriteBarrier<JSObject> >::Iterator it = m_methods.begin(), end = m_methods.end(); it != end; ++it)
+        markStack.append(&it.value());
 }
 

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

@@ -84 +84 @@
     QPointer<QObject> m_object;
     QObject* m_hashkey;
-    mutable QHash<QByteArray, DeprecatedPtr<JSObject> > m_methods;
+    mutable QHash<QByteArray, WriteBarrier<JSObject> > m_methods;
     mutable QHash<QString, QtField*> m_fields;
     mutable WriteBarrier<QtRuntimeMetaMethod> m_defaultMethod;