Get rid of QQmlIdObjectsArray

The context wrapper can do this directly, and give access to the
array by index. Simplifies code, and is one less object we need
to allocate on the JS heap.

Change-Id: I9d9d3a47920e97c42234a27aa66cd5ae3cc28085
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 4 insertions, 38 deletions

diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index d06c557dfe..3d704d0b4e 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -61,7 +61,6 @@ Heap::QmlContextWrapper::QmlContextWrapper(QV4::ExecutionEngine *engine, QQmlCon
     , isNullWrapper(false)
     , context(context)
     , scopeObject(scopeObject)
-    , idObjectsWrapper(Q_NULLPTR)
 {
 }
 
@@ -332,14 +331,6 @@ void QmlContextWrapper::put(Managed *m, String *name, const Value &value)
     Object::put(m, name, value);
 }
 
-void QmlContextWrapper::markObjects(Heap::Base *m, ExecutionEngine *engine)
-{
-    QmlContextWrapper::Data *This = static_cast<QmlContextWrapper::Data *>(m);
-    if (This->idObjectsWrapper)
-        This->idObjectsWrapper->mark(engine);
-    Object::markObjects(m, engine);
-}
-
 void QmlContextWrapper::registerQmlDependencies(ExecutionEngine *engine, const CompiledData::Function *compiledFunction)
 {
     // Let the caller check and avoid the function call :)
@@ -383,15 +374,6 @@ void QmlContextWrapper::registerQmlDependencies(ExecutionEngine *engine, const C
 
 }
 
-ReturnedValue QmlContextWrapper::idObjectsArray()
-{
-    if (!d()->idObjectsWrapper) {
-        ExecutionEngine *v4 = engine();
-        d()->idObjectsWrapper = v4->memoryManager->alloc<QQmlIdObjectsArray>(v4, this);
-    }
-    return d()->idObjectsWrapper->asReturnedValue();
-}
-
 ReturnedValue QmlContextWrapper::qmlSingletonWrapper(ExecutionEngine *v4, String *name)
 {
     if (!d()->context->imports)
@@ -413,20 +395,11 @@ ReturnedValue QmlContextWrapper::qmlSingletonWrapper(ExecutionEngine *v4, String
     return QJSValuePrivate::convertedToValue(engine(), siinfo->scriptApi(e));
 }
 
-DEFINE_OBJECT_VTABLE(QQmlIdObjectsArray);
-
-Heap::QQmlIdObjectsArray::QQmlIdObjectsArray(ExecutionEngine *engine, QV4::QmlContextWrapper *contextWrapper)
-    : Heap::Object(engine)
-    , contextWrapper(contextWrapper->d())
-{
-}
-
-ReturnedValue QQmlIdObjectsArray::getIndexed(const Managed *m, uint index, bool *hasProperty)
+ReturnedValue QmlContextWrapper::getIndexed(const Managed *m, uint index, bool *hasProperty)
 {
-    Scope scope(static_cast<const QV4::QQmlIdObjectsArray*>(m)->engine());
-    Scoped<QQmlIdObjectsArray> This(scope, static_cast<const QV4::QQmlIdObjectsArray*>(m));
-    Scoped<QmlContextWrapper> contextWrapper(scope, This->d()->contextWrapper);
-    QQmlContextData *context = contextWrapper->getContext();
+    const QV4::QmlContextWrapper *This = static_cast<const QV4::QmlContextWrapper *>(m);
+    Scope scope(This->engine());
+    QQmlContextData *context = This->getContext();
     if (!context) {
         if (hasProperty)
             *hasProperty = false;
@@ -448,11 +421,4 @@ ReturnedValue QQmlIdObjectsArray::getIndexed(const Managed *m, uint index, bool
     return QObjectWrapper::wrap(This->engine(), context->idValues[index].data());
 }
 
-void QQmlIdObjectsArray::markObjects(Heap::Base *that, ExecutionEngine *engine)
-{
-    QQmlIdObjectsArray::Data *This = static_cast<QQmlIdObjectsArray::Data *>(that);
-    This->contextWrapper->mark(engine);
-    Object::markObjects(that, engine);
-}
-
 QT_END_NAMESPACE