Clean up ExecutionContext's for QML

Create a specialized QmlContext instead of re-using
a call context with a QQmlContextWrapper as activation
object.

This saves some memory and opens up the route to getting
rid of the context wrapper in a future commit.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 59a589a624..4c8644e8c2 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -91,7 +91,6 @@ struct QmlBindingWrapper : Heap::FunctionObject {
     // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
     QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Object *qml);
     Pointer<Object> qml;
-    Pointer<CallContext> qmlContext;
 };
 
 }
@@ -99,10 +98,10 @@ struct QmlBindingWrapper : Heap::FunctionObject {
 struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
     V4_OBJECT2(QmlBindingWrapper, FunctionObject)
 
-    static ReturnedValue call(const Managed *that, CallData *);
+    static ReturnedValue call(const Managed *that, CallData *callData);
     static void markObjects(Heap::Base *m, ExecutionEngine *e);
 
-    Heap::CallContext *context() const { return d()->qmlContext; }
+    Heap::QmlContext *context() const { return static_cast<Heap::QmlContext *>(d()->scope.ptr); }
 
     static Heap::FunctionObject *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction,
                                                               const QList<QByteArray> &signalParameters = QList<QByteArray>(), QString *error = 0);