Evaluate all shared bindings together using a shared context

The vast majority of bindings are capable of being shared (that is, don't
introduce closures themselves) and consequently this improves the
performance of almost every app.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index ac933a3ae3..59d886c366 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -73,6 +73,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QV8Bindings;
 class QDeclarativeContext;
 class QDeclarativeExpression;
 class QDeclarativeEngine;
@@ -192,9 +193,6 @@ public:
     void setIdProperty(int, QObject *);
     void setIdPropertyData(QDeclarativeIntegerCache *);
 
-    // Optimized binding pointer
-    QDeclarativeV4Bindings *optimizedBindings;
-
     // Linked contexts. this owns linkedContext.
     QDeclarativeContextData *linkedContext;
 
@@ -202,6 +200,10 @@ public:
     // context
     QDeclarativeComponentAttached *componentAttached;
 
+    // Optimized binding objects.  Needed for deferred properties.
+    QDeclarativeV4Bindings *v4bindings;
+    QV8Bindings *v8bindings;
+
     // Return the outermost id for obj, if any.
     QString findObjectId(const QObject *obj) const;