1 files changed, 44 insertions, 42 deletions

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index a7c63c9df1..dae932e705 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -61,7 +61,7 @@
 #include <QtCore/qdatastream.h>
 #include <private/qsimd_p.h>
 
-#include <private/qv4value_inl_p.h>
+#include <private/qv4value_p.h>
 #include <private/qv4dateobject_p.h>
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4mm_p.h>
@@ -171,15 +171,13 @@ const QSet<QString> &QV8Engine::illegalNames() const
     return m_illegalNames;
 }
 
-QQmlContextData *QV8Engine::callingContext()
-{
-    return QV4::QmlContextWrapper::callingContext(m_v4Engine);
-}
-
 void QV8Engine::initializeGlobal()
 {
     QV4::Scope scope(m_v4Engine);
-    QV4::GlobalExtensions::init(m_engine, m_v4Engine->globalObject());
+    QV4::GlobalExtensions::init(m_v4Engine->globalObject, QJSEngine::AllExtensions);
+
+    QV4::ScopedObject qt(scope, m_v4Engine->memoryManager->allocObject<QV4::QtObject>(m_engine));
+    m_v4Engine->globalObject->defineDefaultProperty(QStringLiteral("Qt"), qt);
 
     QQmlLocale::registerStringLocaleCompare(m_v4Engine);
     QQmlDateExtension::registerExtension(m_v4Engine);
@@ -191,46 +189,52 @@ void QV8Engine::initializeGlobal()
     qt_add_sqlexceptions(m_v4Engine);
 
     {
-        for (uint i = 0; i < m_v4Engine->globalObject()->internalClass()->size; ++i) {
-            if (m_v4Engine->globalObject()->internalClass()->nameMap.at(i))
-                m_illegalNames.insert(m_v4Engine->globalObject()->internalClass()->nameMap.at(i)->string);
+        for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) {
+            if (m_v4Engine->globalObject->internalClass()->nameMap.at(i))
+                m_illegalNames.insert(m_v4Engine->globalObject->internalClass()->nameMap.at(i)->string);
         }
     }
+}
 
-    {
-#define FREEZE_SOURCE "(function freeze_recur(obj) { "\
-                      "    if (Qt.isQtObject(obj)) return;"\
-                      "    if (obj != Function.connect && obj != Function.disconnect && "\
-                      "        obj instanceof Object) {"\
-                      "        var properties = Object.getOwnPropertyNames(obj);"\
-                      "        for (var prop in properties) { "\
-                      "            if (prop == \"connect\" || prop == \"disconnect\") {"\
-                      "                Object.freeze(obj[prop]); "\
-                      "                continue;"\
-                      "            }"\
-                      "            freeze_recur(obj[prop]);"\
-                      "        }"\
-                      "    }"\
-                      "    if (obj instanceof Object) {"\
-                      "        Object.freeze(obj);"\
-                      "    }"\
-                      "})"
-
-        QV4::ScopedFunctionObject result(scope, QV4::Script::evaluate(m_v4Engine, QString::fromUtf8(FREEZE_SOURCE), 0));
-        Q_ASSERT(!!result);
-        m_freezeObject.set(scope.engine, result);
-#undef FREEZE_SOURCE
+static void freeze_recursive(QV4::ExecutionEngine *v4, QV4::Object *object)
+{
+    if (object->as<QV4::QObjectWrapper>())
+        return;
+
+    QV4::Scope scope(v4);
+
+    bool instanceOfObject = false;
+    QV4::ScopedObject p(scope, object->prototype());
+    while (p) {
+        if (p->d() == v4->objectPrototype()->d()) {
+            instanceOfObject = true;
+            break;
+        }
+        p = p->prototype();
+    }
+    if (!instanceOfObject)
+        return;
+
+    QV4::InternalClass *frozen = object->internalClass()->propertiesFrozen();
+    if (object->internalClass() == frozen)
+        return;
+    object->setInternalClass(frozen);
+
+    QV4::ScopedObject o(scope);
+    for (uint i = 0; i < frozen->size; ++i) {
+        if (!frozen->nameMap.at(i))
+            continue;
+        o = *object->propertyData(i);
+        if (o)
+            freeze_recursive(v4, o);
     }
 }
 
 void QV8Engine::freezeObject(const QV4::Value &value)
 {
     QV4::Scope scope(m_v4Engine);
-    QV4::ScopedFunctionObject f(scope, m_freezeObject.value());
-    QV4::ScopedCallData callData(scope, 1);
-    callData->args[0] = value;
-    callData->thisObject = m_v4Engine->globalObject();
-    f->call(callData);
+    QV4::ScopedObject o(scope, value);
+    freeze_recursive(m_v4Engine, o);
 }
 
 struct QV8EngineRegistrationData
@@ -266,9 +270,7 @@ void QV8Engine::setExtensionData(int index, Deletable *data)
 void QV8Engine::initQmlGlobalObject()
 {
     initializeGlobal();
-    QV4::Scope scope(m_v4Engine);
-    QV4::ScopedValue v(scope, m_v4Engine->globalObject());
-    freezeObject(v);
+    freezeObject(*m_v4Engine->globalObject);
 }
 
 void QV8Engine::setEngine(QQmlEngine *engine)
@@ -279,7 +281,7 @@ void QV8Engine::setEngine(QQmlEngine *engine)
 
 QV4::ReturnedValue QV8Engine::global()
 {
-    return m_v4Engine->globalObject()->asReturnedValue();
+    return m_v4Engine->globalObject->asReturnedValue();
 }
 
 void QV8Engine::startTimer(const QString &timerName)