[webkit-changes] [95117] trunk/Source/WebCore

Wed, 14 Sep 2011 13:50:00 -0700

Title: [95117] trunk/Source/WebCore
Revision
95117
Author
[email protected]
Date
2011-09-14 13:51:02 -0700 (Wed, 14 Sep 2011)

Log Message

REGRESSION: r95108 broke Qt Linux tests
https://bugs.webkit.org/show_bug.cgi?id=68104

Patch by Mark Hahnenberg <[email protected]> on 2011-09-14
Reviewed by Csaba Osztrogonác.

No new tests.

Build fix for Qt tests broken in r95108.

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtRuntimeMethod::QtRuntimeMethod):
(JSC::Bindings::QtRuntimeMetaMethod::QtRuntimeMetaMethod):
(JSC::Bindings::QtRuntimeConnectionMethod::QtRuntimeConnectionMethod):
* bridge/qt/qt_runtime.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (95116 => 95117)


--- trunk/Source/WebCore/ChangeLog	2011-09-14 20:48:43 UTC (rev 95116)
+++ trunk/Source/WebCore/ChangeLog	2011-09-14 20:51:02 UTC (rev 95117)
@@ -1,3 +1,20 @@
+2011-09-14  Mark Hahnenberg  <[email protected]>
+
+        REGRESSION: r95108 broke Qt Linux tests
+        https://bugs.webkit.org/show_bug.cgi?id=68104
+
+        Reviewed by Csaba Osztrogonác.
+
+        No new tests.
+
+        Build fix for Qt tests broken in r95108.
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::QtRuntimeMethod::QtRuntimeMethod):
+        (JSC::Bindings::QtRuntimeMetaMethod::QtRuntimeMetaMethod):
+        (JSC::Bindings::QtRuntimeConnectionMethod::QtRuntimeConnectionMethod):
+        * bridge/qt/qt_runtime.h:
+
 2011-09-14  James Robinson  <[email protected]>
 
         [skia] fast/canvas/setWidthResetAfterForcedRender is flaky

Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (95116 => 95117)


--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2011-09-14 20:48:43 UTC (rev 95116)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2011-09-14 20:51:02 UTC (rev 95117)
@@ -1006,7 +1006,7 @@
 
 const ClassInfo QtRuntimeMethod::s_info = { "QtRuntimeMethod", &InternalFunction::s_info, 0, 0 };
 
-QtRuntimeMethod::QtRuntimeMethod(QtRuntimeMethodData* dd, ExecState* exec, Structure* structure, const Identifier& identifier, PassRefPtr<QtInstance> instance)
+QtRuntimeMethod::QtRuntimeMethod(QtRuntimeMethodData* dd, ExecState* exec, Structure* structure, const Identifier& identifier)
     : InternalFunction(exec->lexicalGlobalObject(), structure)
     , d_ptr(dd)
 {
@@ -1426,7 +1426,7 @@
 }
 
 QtRuntimeMetaMethod::QtRuntimeMetaMethod(ExecState* exec, Structure* structure, const Identifier& identifier, PassRefPtr<QtInstance> instance, int index, const QByteArray& signature, bool allowPrivate)
-    : QtRuntimeMethod (new QtRuntimeMetaMethodData(), exec, structure, identifier, instance)
+    : QtRuntimeMethod (new QtRuntimeMetaMethodData(), exec, structure, identifier)
 {
     finishCreation(exec, identifier, instance, index, signature, allowPrivate);
 }
@@ -1576,7 +1576,7 @@
 QMultiMap<QObject*, QtConnectionObject*> QtRuntimeConnectionMethod::connections;
 
 QtRuntimeConnectionMethod::QtRuntimeConnectionMethod(ExecState* exec, Structure* structure, const Identifier& identifier, bool isConnect, PassRefPtr<QtInstance> instance, int index, const QByteArray& signature)
-    : QtRuntimeMethod (new QtRuntimeConnectionMethodData(), exec, structure, identifier, instance)
+    : QtRuntimeMethod (new QtRuntimeConnectionMethodData(), exec, structure, identifier)
 {
     finishCreation(exec, identifier, isConnect, instance, index, signature);
 }

Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.h (95116 => 95117)


--- trunk/Source/WebCore/bridge/qt/qt_runtime.h	2011-09-14 20:48:43 UTC (rev 95116)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.h	2011-09-14 20:51:02 UTC (rev 95117)
@@ -148,7 +148,7 @@
     static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | InternalFunction::StructureFlags | OverridesVisitChildren;
 
     QtRuntimeMethodData *d_func() const {return d_ptr;}
-    QtRuntimeMethod(QtRuntimeMethodData *dd, ExecState *, Structure*, const Identifier &name, PassRefPtr<QtInstance>);
+    QtRuntimeMethod(QtRuntimeMethodData *dd, ExecState *, Structure*, const Identifier &name);
     QtRuntimeMethodData *d_ptr;
 };
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to