diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-24 11:21:10 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-24 12:41:25 +0200 |
commit | 1eb41200948ab414f1c47d93123b41c547a993df (patch) | |
tree | 6a14bff7c95bb346825e60b6721b5829690eb0da /src/qml/qml/qqmlvme.cpp | |
parent | 1d62cefbaa23ef96fa4dc36d950cc2d9a2d4b5c3 (diff) |
Remove QV8Bindings class
This class tries to optimise binding compilation with v8. With the
approach in v4 where we don't rewrite binding expressions anymore,
this is not required anymore.
Change-Id: I616aeeba85bc17a950d4c7341b3042ed8aa42bff
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
-rw-r--r-- | src/qml/qml/qqmlvme.cpp | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 0c89e0a5ff..48bd4beb84 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -57,13 +57,13 @@ #include "qqmlcomponent_p.h" #include "qqmlvmemetaobject_p.h" #include "qqmlcontext_p.h" -#include <private/qv8bindings_p.h> #include "qqmlglobal_p.h" #include <private/qfinitestack_p.h> #include "qqmlscriptstring.h" #include "qqmlscriptstring_p.h" #include "qqmlpropertyvalueinterceptor_p.h" #include "qqmlvaluetypeproxybinding_p.h" +#include "qqmlexpression_p.h" #include <QStack> #include <QPointF> @@ -792,10 +792,6 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, status->classBegin(); QML_END_INSTR(BeginObject) - QML_BEGIN_INSTR(InitV8Bindings) - CTXT->v8bindings = new QV8Bindings(&PROGRAMS[instr.programIndex], instr.line, CTXT); - QML_END_INSTR(InitV8Bindings) - QML_BEGIN_INSTR(StoreBinding) QObject *target = objects.at(objects.count() - 1 - instr.owner); @@ -830,47 +826,6 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, } QML_END_INSTR(StoreBinding) - QML_BEGIN_INSTR(StoreV8Binding) - QObject *target = - objects.at(objects.count() - 1 - instr.owner); - QObject *scope = - objects.at(objects.count() - 1 - instr.context); - - int coreIndex = instr.property.coreIndex; - - if (instr.isRoot && BINDINGSKIPLIST.testBit(coreIndex)) - QML_NEXT_INSTR(StoreV8Binding); - - QQmlAbstractBinding *binding = CTXT->v8bindings->configBinding(target, scope, - &instr); - if (binding && !instr.isFallback) { - bindValues.push(binding); - binding->m_mePtr = &bindValues.top(); - - if (instr.isAlias) { - QQmlAbstractBinding *old = - QQmlPropertyPrivate::setBindingNoEnable(target, coreIndex, - instr.property.getValueTypeCoreIndex(), - binding); - if (old) { old->destroy(); } - } else { - typedef QQmlPropertyPrivate QDPP; - Q_ASSERT(binding->propertyIndex() == QDPP::bindingIndex(instr.property)); - Q_ASSERT(binding->object() == target); - - CLEAN_PROPERTY(target, QDPP::bindingIndex(instr.property)); - - binding->addToObject(); - - if (instr.isSafe && !instr.property.isValueTypeVirtual()) { - QQmlData *data = QQmlData::get(target); - Q_ASSERT(data); - data->setPendingBindingBit(target, coreIndex); - } - } - } - QML_END_INSTR(StoreV8Binding) - QML_BEGIN_INSTR(StoreValueSource) QObject *obj = objects.pop(); QQmlPropertyValueSource *vs = reinterpret_cast<QQmlPropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.castValue); |