Commit 1a14b16f authored by oliver@apple.com's avatar oliver@apple.com

Try to fix Qt build.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77099 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ba805bee
2011-01-30 Oliver Hunt <oliver@apple.com>
Try to fix Qt build.
* bridge/qt/qt_instance.cpp:
(JSC::Bindings::QtInstance::QtInstance):
(JSC::Bindings::QtInstance::removeCachedMethod):
(JSC::Bindings::QtInstance::markAggregate):
* bridge/qt/qt_instance.h:
2011-01-30 Oliver Hunt <oliver@apple.com>
Convert markstack to a slot visitor API
......@@ -82,7 +82,6 @@ QtInstance::QtInstance(QObject* o, PassRefPtr<RootObject> rootObject, QScriptEng
, m_class(0)
, m_object(o)
, m_hashkey(o)
, m_defaultMethod(0)
, m_ownership(ownership)
{
}
......@@ -149,7 +148,7 @@ void QtInstance::put(JSObject* object, ExecState* exec, const Identifier& proper
void QtInstance::removeCachedMethod(JSObject* method)
{
if (m_defaultMethod == method)
m_defaultMethod = 0;
m_defaultMethod.clear();
for (QHash<QByteArray, JSObject*>::Iterator it = m_methods.begin(),
end = m_methods.end(); it != end; ++it)
......@@ -188,10 +187,10 @@ RuntimeObject* QtInstance::newRuntimeObject(ExecState* exec)
void QtInstance::markAggregate(MarkStack& markStack)
{
if (m_defaultMethod)
markStack.append(m_defaultMethod);
foreach (JSObject* val, m_methods.values()) {
markStack.append(&m_defaultMethod);
foreach (DeprecatedPtr<JSObject>& val, m_methods.values()) {
if (val)
markStack.append(val);
markStack.append(&val);
}
}
......
......@@ -83,9 +83,9 @@ private:
mutable QtClass* m_class;
QPointer<QObject> m_object;
QObject* m_hashkey;
mutable QHash<QByteArray, JSObject*> m_methods;
mutable QHash<QByteArray, DeprecatedPtr<JSObject> > m_methods;
mutable QHash<QString, QtField*> m_fields;
mutable QtRuntimeMetaMethod* m_defaultMethod;
mutable WriteBarrier<QtRuntimeMetaMethod> m_defaultMethod;
QScriptEngine::ValueOwnership m_ownership;
};
......
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