From f468f7157110f394d6815a1552c8a0c14dae7a20 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Sun, 26 Apr 2015 14:24:08 +0200
Subject: Get rid of qv4qmlextensions

It only contained the proto for the value type wrapper. Instead
just create it lazily, but reserve space on the js stack for it.

Change-Id: I2301549b6dc4007bd5ac848e1dca25aafd583c4a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/qml/qqmlvaluetypewrapper.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 3d6405c84b..5d5d675c57 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -43,7 +43,6 @@
 #include <private/qv4engine_p.h>
 #include <private/qv4functionobject_p.h>
 #include <private/qv4variantobject_p.h>
-#include <private/qv4qmlextensions_p.h>
 #include <private/qv4alloca_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -165,13 +164,13 @@ bool QQmlValueTypeReference::readReferenceValue() const
 
 void QQmlValueTypeWrapper::initProto(ExecutionEngine *v4)
 {
-    if (v4->qmlExtensions()->valueTypeWrapperPrototype)
+    if (v4->valueTypeWrapperPrototype()->as<Object>())
         return;
 
     Scope scope(v4);
     ScopedObject o(scope, v4->newObject());
     o->defineDefaultProperty(v4->id_toString(), method_toString, 1);
-    v4->qmlExtensions()->valueTypeWrapperPrototype = o->d();
+    v4->jsObjects[QV4::ExecutionEngine::ValueTypeProto] = o->d();
 }
 
 ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, QObject *object, int property, const QMetaObject *metaObject, int typeId)
@@ -180,7 +179,7 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, QObject *obj
     initProto(engine);
 
     Scoped<QQmlValueTypeReference> r(scope, engine->memoryManager->alloc<QQmlValueTypeReference>(engine));
-    ScopedObject proto(scope, engine->qmlExtensions()->valueTypeWrapperPrototype);
+    ScopedObject proto(scope, engine->valueTypeWrapperPrototype());
     r->setPrototype(proto);
     r->d()->object = object; r->d()->property = property;
     r->d()->propertyCache = QJSEnginePrivate::get(engine)->cache(metaObject);
@@ -195,7 +194,7 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, const QVaria
     initProto(engine);
 
     Scoped<QQmlValueTypeWrapper> r(scope, engine->memoryManager->alloc<QQmlValueTypeWrapper>(engine));
-    ScopedObject proto(scope, engine->qmlExtensions()->valueTypeWrapperPrototype);
+    ScopedObject proto(scope, engine->valueTypeWrapperPrototype());
     r->setPrototype(proto);
     r->d()->propertyCache = QJSEnginePrivate::get(engine)->cache(metaObject);
     r->d()->valueType = QQmlValueTypeFactory::valueType(typeId);
-- 
cgit v1.2.3