Further simplify relation between different engines

The only engine we ever ask for QJSEngine is QV4::ExecutionEngine.

Change-Id: Ia1354e552bddac72177b7aa62de5a7a502089841
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

6 files changed, 15 insertions, 17 deletions

diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 020a83f837..d03882f233 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -290,9 +290,9 @@ QJSEngine::QJSEngine()
 
 QJSEngine::QJSEngine(QObject *parent)
     : QObject(*new QJSEnginePrivate, parent)
-    , m_v4Engine(new QV4::ExecutionEngine)
+    , m_v4Engine(new QV4::ExecutionEngine(this))
 {
-    m_v4Engine->v8Engine = new QV8Engine(this, m_v4Engine);
+    m_v4Engine->v8Engine = new QV8Engine(m_v4Engine);
     checkForApplicationInstance();
 
     QJSEnginePrivate::addToDebugServer(this);
@@ -303,9 +303,9 @@ QJSEngine::QJSEngine(QObject *parent)
 */
 QJSEngine::QJSEngine(QJSEnginePrivate &dd, QObject *parent)
     : QObject(dd, parent)
-    , m_v4Engine(new QV4::ExecutionEngine)
+    , m_v4Engine(new QV4::ExecutionEngine(this))
 {
-    m_v4Engine->v8Engine = new QV8Engine(this, m_v4Engine);
+    m_v4Engine->v8Engine = new QV8Engine(m_v4Engine);
     checkForApplicationInstance();
 }
 
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 259df976c5..2007ad74c2 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -110,7 +110,7 @@ ReturnedValue throwTypeError(const FunctionObject *b, const QV4::Value *, const
 #ifdef V4_BOOTSTRAP
 QJSEngine *ExecutionEngine::jsEngine() const
 {
-    return v8Engine->publicEngine();
+    return publicEngine;
 }
 
 QQmlEngine *ExecutionEngine::qmlEngine() const
@@ -121,7 +121,7 @@ QQmlEngine *ExecutionEngine::qmlEngine() const
 
 qint32 ExecutionEngine::maxCallDepth = -1;
 
-ExecutionEngine::ExecutionEngine()
+ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
     : executableAllocator(new QV4::ExecutableAllocator)
     , regExpAllocator(new QV4::ExecutableAllocator)
     , bumperPointerAllocator(new WTF::BumpPointerAllocator)
@@ -129,6 +129,7 @@ ExecutionEngine::ExecutionEngine()
     , gcStack(new WTF::PageAllocation)
     , globalCode(0)
     , v8Engine(0)
+    , publicEngine(jsEngine)
     , argumentsAccessors(0)
     , nArgumentsAccessors(0)
     , m_engineId(engineSerial.fetchAndAddOrdered(1))
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index c048f5f68d..bb832050cd 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -153,10 +153,11 @@ public:
     QJSEngine *jsEngine() const;
     QQmlEngine *qmlEngine() const;
 #else // !V4_BOOTSTRAP
-    QJSEngine *jsEngine() const { return v8Engine->publicEngine(); }
-    QQmlEngine *qmlEngine() const { return v8Engine ? v8Engine->engine() : nullptr; }
+    QJSEngine *jsEngine() const { return publicEngine; }
+    QQmlEngine *qmlEngine() const { return v8Engine->engine(); }
 #endif // V4_BOOTSTRAP
     QV8Engine *v8Engine;
+    QJSEngine *publicEngine;
 
     enum JSObjects {
         RootContext,
@@ -371,7 +372,7 @@ public:
 
     int internalClassIdCount = 0;
 
-    ExecutionEngine();
+    ExecutionEngine(QJSEngine *jsEngine = nullptr);
     ~ExecutionEngine();
 
 #if !QT_CONFIG(qml_debug)
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 2bf623f144..004673b5a6 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -123,9 +123,8 @@ static void restoreJSValue(QDataStream &stream, void *data)
     }
 }
 
-QV8Engine::QV8Engine(QJSEngine *qq, QV4::ExecutionEngine *v4)
-    : q(qq)
-    , m_engine(0)
+QV8Engine::QV8Engine(QV4::ExecutionEngine *v4)
+    : m_engine(0)
     , m_v4Engine(v4)
     , m_xmlHttpRequestData(0)
 {
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index eb2b8b474c..e18f4adfed 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -154,10 +154,9 @@ class Q_QML_PRIVATE_EXPORT QV8Engine
     friend class QJSEngine;
 public:
 //    static QJSEngine* get(QV8Engine* d) { Q_ASSERT(d); return d->q; }
-    static QV4::ExecutionEngine *getV4(QJSEngine *q) { return q->handle(); }
     static QV4::ExecutionEngine *getV4(QV8Engine *d) { return d->m_v4Engine; }
 
-    QV8Engine(QJSEngine* qq, QV4::ExecutionEngine *v4);
+    QV8Engine(QV4::ExecutionEngine *v4);
     virtual ~QV8Engine();
 
     // This enum should be in sync with QQmlEngine::ObjectOwnership
@@ -170,7 +169,6 @@ public:
     void initQmlGlobalObject();
     void setEngine(QQmlEngine *engine);
     QQmlEngine *engine() { return m_engine; }
-    QJSEngine *publicEngine() { return q; }
     QQmlDelayedCallQueue *delayedCallQueue() { return &m_delayedCallQueue; }
 
     void *xmlHttpRequestData() const { return m_xmlHttpRequestData; }
@@ -202,7 +200,6 @@ public:
     int consoleCountHelper(const QString &file, quint16 line, quint16 column);
 
 protected:
-    QJSEngine* q;
     QQmlEngine *m_engine;
     QQmlDelayedCallQueue m_delayedCallQueue;
 
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index 32c0c86ff6..a9039cc4b9 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -201,7 +201,7 @@ private:
 };
 
 QQuickWorkerScriptEnginePrivate::WorkerEngine::WorkerEngine(QQuickWorkerScriptEnginePrivate *parent)
-    : QV8Engine(nullptr, new QV4::ExecutionEngine), p(parent)
+    : QV8Engine(new QV4::ExecutionEngine), p(parent)
 #if QT_CONFIG(qml_network)
 , accessManager(0)
 #endif