Cleanup retrieval of scope and context objects

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

15 files changed, 50 insertions, 53 deletions

diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 09a15369a4..41457312f4 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -126,9 +126,11 @@ struct WithContext : ExecutionContext {
     Pointer<Object> withObject;
 };
 
+struct QmlContextWrapper;
+
 struct QmlContext : ExecutionContext {
     QmlContext(QV4::ExecutionContext *outer, QV4::QmlContextWrapper *qml);
-    Pointer<Object> qml;
+    Pointer<QmlContextWrapper> qml;
 };
 
 }
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 3d541e53a3..016187f488 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -720,7 +720,7 @@ Heap::Object *ExecutionEngine::newForEachIteratorObject(Object *o)
     return obj->d();
 }
 
-Heap::Object *ExecutionEngine::qmlContextObject() const
+Heap::QmlContextWrapper *ExecutionEngine::qmlContextObject() const
 {
     Heap::ExecutionContext *ctx = currentContext();
 
@@ -741,6 +741,18 @@ Heap::Object *ExecutionEngine::qmlContextObject() const
     return static_cast<Heap::QmlContext *>(ctx)->qml;
 }
 
+QObject *ExecutionEngine::qmlScopeObject() const
+{
+    return qmlContextObject()->scopeObject;
+}
+
+QQmlContextData *ExecutionEngine::callingQmlContext() const
+{
+    Heap::QmlContextWrapper *w = qmlContextObject();
+
+    return w ? w->context.contextData() : 0;
+}
+
 QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const
 {
     Scope scope(const_cast<ExecutionEngine *>(this));
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index c2d3183e35..d4bcf363a2 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -51,6 +51,7 @@ class QV8Engine;
 class QQmlError;
 class QJSEngine;
 class QQmlEngine;
+class QQmlContextData;
 
 namespace QV4 {
 namespace Debugging {
@@ -386,7 +387,10 @@ public:
 
     Heap::Object *newForEachIteratorObject(Object *o);
 
-    Heap::Object *qmlContextObject() const;
+    QV4::Heap::QmlContextWrapper *qmlContextObject() const;
+    QObject *qmlScopeObject() const;
+    QQmlContextData *callingQmlContext() const;
+
 
     StackTrace stackTrace(int frameLimit = -1) const;
     StackFrame currentStackFrame() const;
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 9bbcc0e21b..2eb61081c7 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -176,7 +176,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx)
         return QV4::Encode::undefined();
 
     QV4::Scope scope(ctx->engine());
-    QQmlContextData *context = QV4::QmlContextWrapper::callingContext(scope.engine);
+    QQmlContextData *context = scope.engine->callingQmlContext();
 
     if (!context || !context->isJSContext)
         V4THROW_ERROR("Qt.include(): Can only be called from JavaScript files");
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 8769b418dc..4f6331c54b 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -471,7 +471,7 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP
             }
         } else {
             // binding assignment.
-            QQmlContextData *callingQmlContext = QV4::QmlContextWrapper::callingContext(scope.engine);
+            QQmlContextData *callingQmlContext = scope.engine->callingQmlContext();
 
             QV4::Scoped<QQmlBindingFunction> bindingFunction(scope, (const Value &)f);
             bindingFunction->initBindingLocation();
@@ -553,7 +553,7 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP
         else
             v = scope.engine->toVariant(value, property->propType);
 
-        QQmlContextData *callingQmlContext = QV4::QmlContextWrapper::callingContext(scope.engine);
+        QQmlContextData *callingQmlContext = scope.engine->callingQmlContext();
         if (!QQmlPropertyPrivate::write(object, *property, v, callingQmlContext)) {
             const char *valueType = 0;
             if (v.userType() == QVariant::Invalid) valueType = "null";
@@ -693,7 +693,7 @@ ReturnedValue QObjectWrapper::create(ExecutionEngine *engine, QObject *object)
 QV4::ReturnedValue QObjectWrapper::get(const Managed *m, String *name, bool *hasProperty)
 {
     const QObjectWrapper *that = static_cast<const QObjectWrapper*>(m);
-    QQmlContextData *qmlContext = QV4::QmlContextWrapper::callingContext(that->engine());
+    QQmlContextData *qmlContext = that->engine()->callingQmlContext();
     return that->getQmlProperty(qmlContext, name, IgnoreRevision, hasProperty, /*includeImports*/ true);
 }
 
@@ -705,7 +705,7 @@ void QObjectWrapper::put(Managed *m, String *name, const Value &value)
     if (v4->hasException || QQmlData::wasDeleted(that->d()->object))
         return;
 
-    QQmlContextData *qmlContext = QV4::QmlContextWrapper::callingContext(v4);
+    QQmlContextData *qmlContext = v4->callingQmlContext();
     if (!setQmlProperty(v4, qmlContext, that->d()->object, name, QV4::QObjectWrapper::IgnoreRevision, value)) {
         QQmlData *ddata = QQmlData::get(that->d()->object);
         // Types created by QML are not extensible at run-time, but for other QObjects we can store them
@@ -724,7 +724,7 @@ PropertyAttributes QObjectWrapper::query(const Managed *m, String *name)
 {
     const QObjectWrapper *that = static_cast<const QObjectWrapper*>(m);
     ExecutionEngine *engine = that->engine();
-    QQmlContextData *qmlContext = QV4::QmlContextWrapper::callingContext(engine);
+    QQmlContextData *qmlContext = engine->callingQmlContext();
     QQmlPropertyData local;
     if (that->findProperty(engine, qmlContext, name, IgnoreRevision, &local)
         || name->equals(engine->id_destroy()) || name->equals(engine->id_toString()))
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 5edea83968..3006ec9fe5 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -1340,7 +1340,7 @@ ReturnedValue Runtime::getQmlIdArray(NoThrowEngine *engine)
 
 ReturnedValue Runtime::getQmlContextObject(NoThrowEngine *engine)
 {
-    QQmlContextData *context = QmlContextWrapper::callingContext(engine);
+    QQmlContextData *context = engine->callingQmlContext();
     if (!context)
         return Encode::undefined();
     return QObjectWrapper::wrap(engine, context->contextObject);
@@ -1348,9 +1348,7 @@ ReturnedValue Runtime::getQmlContextObject(NoThrowEngine *engine)
 
 ReturnedValue Runtime::getQmlScopeObject(NoThrowEngine *engine)
 {
-    Scope scope(engine);
-    QV4::Scoped<QmlContextWrapper> c(scope, engine->qmlContextObject());
-    return QObjectWrapper::wrap(engine, c->getScopeObject());
+    return QObjectWrapper::wrap(engine, engine->qmlScopeObject());
 }
 
 ReturnedValue Runtime::getQmlQObjectProperty(ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)
@@ -1366,14 +1364,12 @@ ReturnedValue Runtime::getQmlQObjectProperty(ExecutionEngine *engine, const Valu
 
 QV4::ReturnedValue Runtime::getQmlAttachedProperty(ExecutionEngine *engine, int attachedPropertiesId, int propertyIndex)
 {
-    Scope scope(engine);
-    QV4::Scoped<QmlContextWrapper> c(scope, engine->qmlContextObject());
-    QObject *scopeObject = c->getScopeObject();
+    QObject *scopeObject = engine->qmlScopeObject();
     QObject *attachedObject = qmlAttachedPropertiesObjectById(attachedPropertiesId, scopeObject);
 
     QJSEngine *jsEngine = engine->jsEngine();
     QQmlData::ensurePropertyCache(jsEngine, attachedObject);
-    return QV4::QObjectWrapper::getProperty(scope.engine, attachedObject, propertyIndex, /*captureRequired*/true);
+    return QV4::QObjectWrapper::getProperty(engine, attachedObject, propertyIndex, /*captureRequired*/true);
 }
 
 ReturnedValue Runtime::getQmlSingletonQObjectProperty(ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)
@@ -1400,7 +1396,7 @@ void Runtime::setQmlQObjectProperty(ExecutionEngine *engine, const Value &object
 
 ReturnedValue Runtime::getQmlImportedScripts(NoThrowEngine *engine)
 {
-    QQmlContextData *context = QmlContextWrapper::callingContext(engine);
+    QQmlContextData *context = engine->callingQmlContext();
     if (!context)
         return Encode::undefined();
     return context->importedScripts.value();
diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 7591df4769..015bfff56a 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -87,9 +87,9 @@ struct ContextStateSaver {
 
 namespace Heap {
 struct QmlBindingWrapper : Heap::FunctionObject {
-    QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QmlContextWrapper *qml);
+    QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::QmlContextWrapper *qml);
     // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
-    QmlBindingWrapper(QV4::ExecutionContext *scope, QmlContextWrapper *qml);
+    QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::QmlContextWrapper *qml);
     Pointer<Object> qml;
 };
 
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index 3d704d0b4e..fd85b64ad1 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -93,14 +93,6 @@ ReturnedValue QmlContextWrapper::urlScope(ExecutionEngine *v4, const QUrl &url)
     return w.asReturnedValue();
 }
 
-QQmlContextData *QmlContextWrapper::callingContext(ExecutionEngine *v4)
-{
-    Scope scope(v4);
-    QV4::Scoped<QmlContextWrapper> c(scope, v4->qmlContextObject());
-
-    return !!c ? c->getContext() : 0;
-}
-
 QQmlContextData *QmlContextWrapper::getContext(const Value &value)
 {
     if (!value.isObject())
@@ -134,7 +126,7 @@ ReturnedValue QmlContextWrapper::get(const Managed *m, String *name, bool *hasPr
     if (resource->d()->isNullWrapper)
         return Object::get(m, name, hasProperty);
 
-    if (QV4::QmlContextWrapper::callingContext(v4) != resource->d()->context)
+    if (v4->callingQmlContext() != resource->d()->context)
         return Object::get(m, name, hasProperty);
 
     result = Object::get(m, name, &hasProp);
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index f689ee857a..e806077326 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -86,7 +86,6 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
     static ReturnedValue qmlScope(ExecutionEngine *e, QQmlContextData *ctxt, QObject *scope);
     static ReturnedValue urlScope(ExecutionEngine *v4, const QUrl &);
 
-    static QQmlContextData *callingContext(ExecutionEngine *v4);
     void takeContextOwnership() {
         d()->ownsContext = true;
     }
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index 3d22b0b38f..1d72b2da0d 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -136,7 +136,7 @@ ReturnedValue QmlTypeWrapper::get(const Managed *m, String *name, bool *hasPrope
     if (hasProperty)
         *hasProperty = true;
 
-    QQmlContextData *context = v4->v8Engine->callingContext();
+    QQmlContextData *context = v4->callingQmlContext();
 
     QObject *object = w->d()->object;
 
@@ -240,7 +240,7 @@ void QmlTypeWrapper::put(Managed *m, String *name, const Value &value)
         return;
 
     QV4::Scope scope(v4);
-    QQmlContextData *context = v4->v8Engine->callingContext();
+    QQmlContextData *context = v4->callingQmlContext();
 
     QQmlType *type = w->d()->type;
     if (type && !type->isSingleton() && w->d()->object) {
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 5d5d675c57..58b6937432 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -418,7 +418,7 @@ void QQmlValueTypeWrapper::put(Managed *m, String *name, const Value &value)
                 return;
             }
 
-            QQmlContextData *context = QmlContextWrapper::callingContext(v4);
+            QQmlContextData *context = v4->callingQmlContext();
 
             QQmlPropertyData cacheData;
             cacheData.setFlags(QQmlPropertyData::IsWritable |
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index ad2c0ea3ea..59927fdac7 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -100,7 +100,7 @@ static ReturnedValue constructMeObject(const Value &thisObj, ExecutionEngine *v4
     Scope scope(v4);
     ScopedObject meObj(scope, v4->newObject());
     meObj->put(ScopedString(scope, v4->newString(QStringLiteral("ThisObject"))), thisObj);
-    ScopedValue v(scope, QmlContextWrapper::qmlScope(v4, v4->v8Engine->callingContext(), 0));
+    ScopedValue v(scope, QmlContextWrapper::qmlScope(v4, v4->callingQmlContext(), 0));
     meObj->put(ScopedString(scope, v4->newString(QStringLiteral("ActivationObject"))), v);
     return meObj.asReturnedValue();
 }
@@ -1769,7 +1769,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
     QUrl url = QUrl(ctx->args()[1].toQStringNoThrow());
 
     if (url.isRelative())
-        url = scope.engine->v8Engine->callingContext()->resolvedUrl(url);
+        url = scope.engine->callingQmlContext()->resolvedUrl(url);
 
     bool async = true;
     // Argument 2 - async (optional)
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 17dfeea168..aff6de7f5e 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -840,21 +840,21 @@ ReturnedValue QtObject::method_openUrlExternally(QV4::CallContext *ctx)
 */
 ReturnedValue QtObject::method_resolvedUrl(QV4::CallContext *ctx)
 {
-    QV8Engine *v8engine = ctx->d()->engine->v8Engine;
+    ExecutionEngine *v4 = ctx->engine();
 
-    QUrl url = ctx->engine()->toVariant(ctx->args()[0], -1).toUrl();
-    QQmlEngine *e = v8engine->engine();
+    QUrl url = v4->toVariant(ctx->args()[0], -1).toUrl();
+    QQmlEngine *e = v4->qmlEngine();
     QQmlEnginePrivate *p = 0;
     if (e) p = QQmlEnginePrivate::get(e);
     if (p) {
-        QQmlContextData *ctxt = v8engine->callingContext();
+        QQmlContextData *ctxt = v4->callingQmlContext();
         if (ctxt)
-            return ctx->d()->engine->newString(ctxt->resolvedUrl(url).toString())->asReturnedValue();
+            return v4->newString(ctxt->resolvedUrl(url).toString())->asReturnedValue();
         else
-            return ctx->d()->engine->newString(url.toString())->asReturnedValue();
+            return v4->newString(url.toString())->asReturnedValue();
     }
 
-    return ctx->d()->engine->newString(e->baseUrl().resolved(url).toString())->asReturnedValue();
+    return v4->newString(e->baseUrl().resolved(url).toString())->asReturnedValue();
 }
 
 /*!
@@ -984,7 +984,7 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
     QV8Engine *v8engine = ctx->d()->engine->v8Engine;
     QQmlEngine *engine = v8engine->engine();
 
-    QQmlContextData *context = v8engine->callingContext();
+    QQmlContextData *context = scope.engine->callingQmlContext();
     Q_ASSERT(context);
     QQmlContext *effectiveContext = 0;
     if (context->isPragmaLibraryContext)
@@ -1091,7 +1091,7 @@ ReturnedValue QtObject::method_createComponent(CallContext *ctx)
     QV8Engine *v8engine = ctx->d()->engine->v8Engine;
     QQmlEngine *engine = v8engine->engine();
 
-    QQmlContextData *context = v8engine->callingContext();
+    QQmlContextData *context = scope.engine->callingQmlContext();
     Q_ASSERT(context);
     QQmlContextData *effectiveContext = context;
     if (context->isPragmaLibraryContext)
@@ -1727,9 +1727,8 @@ ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx)
         V4THROW_ERROR("qsTr(): third argument (n) must be a number");
 
     Scope scope(ctx);
-    QV8Engine *v8engine = ctx->d()->engine->v8Engine;
     QString context;
-    if (QQmlContextData *ctxt = v8engine->callingContext()) {
+    if (QQmlContextData *ctxt = scope.engine->callingQmlContext()) {
         QString path = ctxt->urlString();
         int lastSlash = path.lastIndexOf(QLatin1Char('/'));
         int lastDot = path.lastIndexOf(QLatin1Char('.'));
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index be28b948f5..6cb316ce9f 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -171,11 +171,6 @@ const QSet<QString> &QV8Engine::illegalNames() const
     return m_illegalNames;
 }
 
-QQmlContextData *QV8Engine::callingContext()
-{
-    return QV4::QmlContextWrapper::callingContext(m_v4Engine);
-}
-
 void QV8Engine::initializeGlobal()
 {
     QV4::Scope scope(m_v4Engine);
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 5f286246a4..55e4b15b77 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -190,8 +190,6 @@ public:
     Deletable *listModelData() { return m_listModelData; }
     void setListModelData(Deletable *d) { if (m_listModelData) delete m_listModelData; m_listModelData = d; }
 
-    QQmlContextData *callingContext();
-
     void freezeObject(const QV4::Value &value);
 
     // Return the network access manager for this engine.  By default this returns the network