Convert qqmltypeloader to use QV4::PersistentValue

Change-Id: Ifc4e2aea870a3a8ab37cd4d0674c672f0850f98f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index bbce8e6..db893c1 100644 (file)
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2270,9 +2270,6 @@ void QQmlScriptData::clear()
         scripts.at(ii)->release();
     scripts.clear();
 
-    qPersistentDispose(m_program);
-    qPersistentDispose(m_value);
-
     // An addref() was made when the QQmlCleanup was added to the engine.
     release();
 }

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 68b8f33..d59cef6 100644 (file)
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -69,6 +69,8 @@
 #include <private/qqmlbundle_p.h>
 #include <private/qflagpointer_p.h>
 
+#include <private/qv4value_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlScriptData;
@@ -508,8 +510,8 @@ private:
 
     bool m_loaded;
     QByteArray m_programSource;
-    v8::Persistent<v8::Script> m_program;
-    v8::Persistent<v8::Object> m_value;
+    QExplicitlySharedDataPointer<v8::Script> m_program;
+    QV4::PersistentValue m_value;
     QQmlError m_error;
 };
 

diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index d97058e..fa56756 100644 (file)
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -1158,7 +1158,7 @@ void QQmlVME::reset()
 // Must be called with a handle scope and context
 void QQmlScriptData::initialize(QQmlEngine *engine)
 {
-    Q_ASSERT(m_program.IsEmpty());
+    Q_ASSERT(!m_program);
     Q_ASSERT(engine);
     Q_ASSERT(!hasEngine());
 
@@ -1171,7 +1171,7 @@ void QQmlScriptData::initialize(QQmlEngine *engine)
     if (program.IsEmpty())
         return;
 
-    m_program = qPersistentNew<v8::Script>(program);
+    m_program = program.get();
     m_programSource.clear(); // We don't need this anymore
 
     addToEngine(engine);
@@ -1182,7 +1182,7 @@ void QQmlScriptData::initialize(QQmlEngine *engine)
 QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *script)
 {
     if (script->m_loaded)
-        return script->m_value->v4Value();
+        return script->m_value;
 
     QV4::PersistentValue rv;
 
@@ -1242,7 +1242,7 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s
     v8::Handle<v8::Object> qmlglobal = v8engine->qmlScope(ctxt, 0);
     v8engine->contextWrapper()->takeContextOwnership(qmlglobal);
 
-    if (!script->m_program.IsEmpty()) {
+    if (!!script->m_program) {
         script->m_program->Run(qmlglobal);
     } else {
         // Compilation failed.
@@ -1260,7 +1260,7 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s
 
     rv = qmlglobal->v4Value();
     if (shared) {
-        script->m_value = qPersistentNew<v8::Object>(qmlglobal);
+        script->m_value = rv;
         script->m_loaded = true;
     }