Changeset 77020 in webkit

Timestamp:

Jan 28, 2011, 4:29:41 PM (15 years ago)

Author:

[email protected]

Message:

Fixed Qt build.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-28  Oliver Hunt  <[email protected]>
+
+        Fix Qt build.
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::QtRuntimeMetaMethod::QtRuntimeMetaMethod):
+        (JSC::Bindings::QtRuntimeMetaMethod::markChildren):
+        (JSC::Bindings::QtRuntimeMetaMethod::connectGetter):
+        (JSC::Bindings::QtRuntimeMetaMethod::disconnectGetter):
+        * bridge/qt/qt_runtime.h:
+
 2011-01-28  Antti Koivisto  <[email protected]>
 

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

@@ -1402 +1402 @@
     d->m_signature = signature;
     d->m_index = index;
-    d->m_connect = 0;
-    d->m_disconnect = 0;
     d->m_allowPrivate = allowPrivate;
 }
@@ -1412 +1410 @@
     QW_D(QtRuntimeMetaMethod);
     if (d->m_connect)
-        markStack.append(d->m_connect);
+        markStack.append(&d->m_connect);
     if (d->m_disconnect)
-        markStack.append(d->m_disconnect);
+        markStack.append(&d->m_disconnect);
 }
 
@@ -1524 +1522 @@
 
     if (!d->m_connect)
-        d->m_connect = new (exec) QtRuntimeConnectionMethod(exec, ident, true, d->m_instance, d->m_index, d->m_signature);
+        d->m_connect.set(exec->globalData(), this, new (exec) QtRuntimeConnectionMethod(exec, ident, true, d->m_instance, d->m_index, d->m_signature));
     return d->m_connect;
 }
@@ -1534 +1532 @@
 
     if (!d->m_disconnect)
-        d->m_disconnect = new (exec) QtRuntimeConnectionMethod(exec, ident, false, d->m_instance, d->m_index, d->m_signature);
+        d->m_disconnect.set(exec->globalData(), this, new (exec) QtRuntimeConnectionMethod(exec, ident, false, d->m_instance, d->m_index, d->m_signature));
     return d->m_disconnect;
 }

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

@@ -130 +130 @@
         bool m_allowPrivate;
         int m_index;
-        QtRuntimeConnectionMethod *m_connect;
-        QtRuntimeConnectionMethod *m_disconnect;
+        WriteBarrier<QtRuntimeConnectionMethod> m_connect;
+        WriteBarrier<QtRuntimeConnectionMethod> m_disconnect;
 };