diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-09 15:09:31 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-25 08:39:56 +0000 |
| commit | c736b099c0376f9b9b1642f23df879f3c7db9b96 (patch) | |
| tree | 9474ed6d00fed6b7677a64768f2f7c7851301d88 | |
| parent | f4ccd465691ea7f120d9f05424e0085361ce86e9 (diff) | |
Set the correct prototype at construction time
Slightly speeds up construction of value type wrappers
Change-Id: Ia50e9bcdb07475ed15b5aac908714d25631a0de8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 9 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper_p.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 004797a10c..8ddf91ef3c 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -154,7 +154,7 @@ bool QQmlValueTypeReference::readReferenceValue() const void QQmlValueTypeWrapper::initProto(ExecutionEngine *v4) { - if (v4->valueTypeWrapperPrototype()->as<Object>()) + if (v4->valueTypeWrapperPrototype()->d()) return; Scope scope(v4); @@ -169,9 +169,8 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, QObject *obj initProto(engine); Scoped<QQmlValueTypeReference> r(scope, engine->memoryManager->allocObject<QQmlValueTypeReference>()); - ScopedObject proto(scope, engine->valueTypeWrapperPrototype()); - r->setPrototype(proto); - r->d()->object = object; r->d()->property = property; + r->d()->object = object; + r->d()->property = property; r->d()->propertyCache = QJSEnginePrivate::get(engine)->cache(metaObject); r->d()->valueType = QQmlValueTypeFactory::valueType(typeId); r->d()->gadgetPtr = 0; @@ -184,8 +183,6 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, const QVaria initProto(engine); Scoped<QQmlValueTypeWrapper> r(scope, engine->memoryManager->allocObject<QQmlValueTypeWrapper>()); - ScopedObject proto(scope, engine->valueTypeWrapperPrototype()); - r->setPrototype(proto); r->d()->propertyCache = QJSEnginePrivate::get(engine)->cache(metaObject); r->d()->valueType = QQmlValueTypeFactory::valueType(typeId); r->d()->gadgetPtr = 0; diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h index 3db5493234..156b4c85d8 100644 --- a/src/qml/qml/qqmlvaluetypewrapper_p.h +++ b/src/qml/qml/qqmlvaluetypewrapper_p.h @@ -76,6 +76,7 @@ struct QQmlValueTypeWrapper : Object { struct Q_QML_EXPORT QQmlValueTypeWrapper : Object { V4_OBJECT2(QQmlValueTypeWrapper, Object) + V4_PROTOTYPE(valueTypeWrapperPrototype) static void destroy(Heap::Base *b); public: |