Commit b796ee10 authored by ossy@webkit.org's avatar ossy@webkit.org

REGRESSION: r95108 broke Qt Linux tests

https://bugs.webkit.org/show_bug.cgi?id=68104

Patch by Mark Hahnenberg <mhahnenberg@apple.com> 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95117 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 896e1960
2011-09-14 Mark Hahnenberg <mhahnenberg@apple.com>
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 <jamesr@chromium.org>
[skia] fast/canvas/setWidthResetAfterForcedRender is flaky
......@@ -1006,7 +1006,7 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con
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 @@ static int findSignalIndex(const QMetaObject* meta, int initialIndex, QByteArray
}
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 @@ JSValue QtRuntimeMetaMethod::disconnectGetter(ExecState* exec, JSValue slotBase,
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);
}
......
......@@ -148,7 +148,7 @@ protected:
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;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment