1 files changed, 25 insertions, 36 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 05a9e45f45..4fecf62082 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -33,9 +33,21 @@
 #ifndef QV4SCRIPT_H
 #define QV4SCRIPT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qv4global_p.h"
 #include "qv4engine_p.h"
 #include "qv4functionobject_p.h"
+#include "qv4context_p.h"
 
 #include <QQmlError>
 
@@ -63,7 +75,7 @@ struct ContextStateSaver {
         , compilationUnit(context->d()->compilationUnit)
         , lineNumber(context->d()->lineNumber)
     {
-        savedContext->m = context->d();
+        savedContext->setM(context->d());
     }
     ContextStateSaver(Scope &scope, Heap::ExecutionContext *context)
         : savedContext(scope.alloc(1))
@@ -72,12 +84,12 @@ struct ContextStateSaver {
         , compilationUnit(context->compilationUnit)
         , lineNumber(context->lineNumber)
     {
-        savedContext->m = context;
+        savedContext->setM(context);
     }
 
     ~ContextStateSaver()
     {
-        Heap::ExecutionContext *ctx = static_cast<Heap::ExecutionContext *>(savedContext->m);
+        Heap::ExecutionContext *ctx = static_cast<Heap::ExecutionContext *>(savedContext->m());
         ctx->strictMode = strictMode;
         ctx->lookups = lookups;
         ctx->compilationUnit = compilationUnit;
@@ -85,52 +97,29 @@ struct ContextStateSaver {
     }
 };
 
-namespace Heap {
-struct QmlBindingWrapper : Heap::FunctionObject {
-    QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::Object *qml);
-    // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
-    QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Object *qml);
-    Object *qml;
-    CallContext *qmlContext;
-};
-
-}
-
-struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
-    V4_OBJECT2(QmlBindingWrapper, FunctionObject)
-
-    static ReturnedValue call(Managed *that, CallData *);
-    static void markObjects(Heap::Base *m, ExecutionEngine *e);
-
-    Heap::CallContext *context() const { return d()->qmlContext; }
-
-    static Heap::FunctionObject *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction,
-                                                              const QList<QByteArray> &signalParameters = QList<QByteArray>(), QString *error = 0);
-
-private:
-};
-
 struct Q_QML_EXPORT Script {
     Script(ExecutionContext *scope, const QString &sourceCode, const QString &source = QString(), int line = 1, int column = 0)
         : sourceFile(source), line(line), column(column), sourceCode(sourceCode)
-        , scope(scope->d()), strictMode(false), inheritContext(false), parsed(false)
+        , scope(scope), strictMode(false), inheritContext(false), parsed(false)
         , vmFunction(0), parseAsBinding(false) {}
-    Script(ExecutionEngine *engine, Object *qml, const QString &sourceCode, const QString &source = QString(), int line = 1, int column = 0)
+    Script(ExecutionEngine *engine, QmlContext *qml, const QString &sourceCode, const QString &source = QString(), int line = 1, int column = 0)
         : sourceFile(source), line(line), column(column), sourceCode(sourceCode)
         , scope(engine->rootContext()), strictMode(false), inheritContext(true), parsed(false)
-        , qml(engine, qml), vmFunction(0), parseAsBinding(true) {}
-    Script(ExecutionEngine *engine, Object *qml, CompiledData::CompilationUnit *compilationUnit);
+        , vmFunction(0), parseAsBinding(true) {
+        if (qml)
+            qmlContext.set(engine, *qml);
+    }
+    Script(ExecutionEngine *engine, QmlContext *qml, CompiledData::CompilationUnit *compilationUnit);
     ~Script();
     QString sourceFile;
     int line;
     int column;
     QString sourceCode;
-    // ### GC
-    Heap::ExecutionContext *scope;
+    ExecutionContext *scope;
     bool strictMode;
     bool inheritContext;
     bool parsed;
-    QV4::PersistentValue qml;
+    QV4::PersistentValue qmlContext;
     QV4::PersistentValue compilationUnitHolder;
     Function *vmFunction;
     bool parseAsBinding;
@@ -144,7 +133,7 @@ struct Q_QML_EXPORT Script {
     static QQmlRefPointer<CompiledData::CompilationUnit> precompile(IR::Module *module, Compiler::JSUnitGenerator *unitGenerator, ExecutionEngine *engine, const QUrl &url, const QString &source,
                                                                     QList<QQmlError> *reportedErrors = 0, QQmlJS::Directives *directivesCollector = 0);
 
-    static ReturnedValue evaluate(ExecutionEngine *engine, const QString &script, Object *scopeObject);
+    static ReturnedValue evaluate(ExecutionEngine *engine, const QString &script, QmlContext *qmlContext);
 };
 
 }