Move most of the ExecutionContext's over to the new mark handling

CallContext still requires further work, as the handling of locals
is different between a CallContext and a SimpleCallContext.

Change-Id: I74945ef701f60907aab0fb1a9939da1331235f6e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4qmlcontext_p.h b/src/qml/jsruntime/qv4qmlcontext_p.h
index 6e5e743609..73100807ae 100644
--- a/src/qml/jsruntime/qv4qmlcontext_p.h
+++ b/src/qml/jsruntime/qv4qmlcontext_p.h
@@ -77,10 +77,13 @@ struct QmlContextWrapper : Object {
     QQmlQPointer<QObject> scopeObject;
 };
 
-struct QmlContext : ExecutionContext {
-    void init(QV4::ExecutionContext *outerContext, QV4::QmlContextWrapper *qml);
+#define QmlContextMembers(class, Member) \
+    Member(class, Pointer<QmlContextWrapper>, qml)
+
+DECLARE_HEAP_OBJECT(QmlContext, ExecutionContext) {
+    DECLARE_MARK_TABLE(QmlContext);
 
-    Pointer<QmlContextWrapper> qml;
+    void init(QV4::ExecutionContext *outerContext, QV4::QmlContextWrapper *qml);
 };
 
 }