Ensure that chained incubation works from componentCompleted.

Make chained AsynchronousIfNested initiated from componentComplete
work correctly, i.e. asynchronous incubator is not Ready until
all chained creation is Ready.

Change-Id: I286cc10e2f09e36dcc6034f3f23681e833d7e6e8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

7 files changed, 36 insertions, 22 deletions

diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index c9ae825ae2..c4fc764e7d 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -511,7 +511,7 @@ QObject *QDeclarativeContextPrivate::context_at(QDeclarativeListProperty<QObject
 
 QDeclarativeContextData::QDeclarativeContextData()
 : parent(0), engine(0), isInternal(false), ownedByParent(false), isJSContext(false), 
-  isPragmaLibraryContext(false), publicContext(0), activeVME(0), propertyNames(0), contextObject(0), 
+  isPragmaLibraryContext(false), publicContext(0), activeVMEData(0), propertyNames(0), contextObject(0),
   imports(0), childContexts(0), nextChild(0), prevChild(0), expressions(0), contextObjects(0), 
   contextGuards(0), idValues(0), idValueCount(0), linkedContext(0), componentAttached(0), 
   v4bindings(0), v8bindings(0)
@@ -520,7 +520,7 @@ QDeclarativeContextData::QDeclarativeContextData()
 
 QDeclarativeContextData::QDeclarativeContextData(QDeclarativeContext *ctxt)
 : parent(0), engine(0), isInternal(false), ownedByParent(false), isJSContext(false), 
-  isPragmaLibraryContext(false), publicContext(ctxt), activeVME(0), propertyNames(0), 
+  isPragmaLibraryContext(false), publicContext(ctxt), activeVMEData(0), propertyNames(0),
   contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0), expressions(0), 
   contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0), 
   componentAttached(0), v4bindings(0), v8bindings(0)
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index ba4edb8e15..a6e83a0692 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -146,9 +146,8 @@ public:
     quint32 dummy:28;
     QDeclarativeContext *publicContext;
 
-    // VME that is constructing this context if any
-    // XXX remove if possible
-    QDeclarativeVME *activeVME;
+    // VME data that is constructing this context if any
+    void *activeVMEData;
 
     // Property name cache
     QDeclarativeIntegerCache *propertyNames;
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 1f539ee082..50b5db897c 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -542,6 +542,9 @@ QDeclarativeEngine::~QDeclarativeEngine()
 
     // ensure we clean up QObjects with JS ownership
     d->v8engine()->gc();
+
+    if (d->incubationController)
+        d->incubationController->d = 0;
 }
 
 /*! \fn void QDeclarativeEngine::quit()
diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index 05c73da3a2..80bdfac24a 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -65,8 +65,8 @@ void QDeclarativeEnginePrivate::incubate(QDeclarativeIncubator &i, QDeclarativeC
         QDeclarativeIncubatorPrivate *parentIncubator = 0;
         QDeclarativeContextData *cctxt = forContext;
         while (cctxt) {
-            if (cctxt->activeVME) {
-                parentIncubator = (QDeclarativeIncubatorPrivate *)cctxt->activeVME->data;
+            if (cctxt->activeVMEData) {
+                parentIncubator = (QDeclarativeIncubatorPrivate *)cctxt->activeVMEData;
                 break;
             }
             cctxt = cctxt->parent;
@@ -113,6 +113,8 @@ and it does not take ownership of it.
 void QDeclarativeEngine::setIncubationController(QDeclarativeIncubationController *controller)
 {
     Q_D(QDeclarativeEngine);
+    if (d->incubationController)
+        d->incubationController->d = 0;
     d->incubationController = controller;
     if (controller) controller->d = d;
 }
@@ -155,6 +157,10 @@ void QDeclarativeIncubatorPrivate::clear()
         component->release();
         component = 0;
     }
+    if (!rootContext.isNull()) {
+        rootContext->activeVMEData = 0;
+        rootContext = 0;
+    }
 
     if (nextWaitingFor.isInList()) {
         Q_ASSERT(waitingOnMe);
@@ -250,6 +256,8 @@ void QDeclarativeIncubationController::incubatingObjectCountChanged(int incubati
 
 void QDeclarativeIncubatorPrivate::incubate(QDeclarativeVME::Interrupt &i)
 {
+    if (!component)
+        return;
     typedef QDeclarativeIncubatorPrivate IP;
     QRecursionWatcher<IP, &IP::recursion> watcher(this);
 
@@ -311,7 +319,9 @@ void QDeclarativeIncubatorPrivate::incubate(QDeclarativeVME::Interrupt &i)
             if (watcher.hasRecursed())
                 return;
 
-            if (vme.complete(i)) {
+            QDeclarativeContextData *ctxt = vme.complete(i);
+            if (ctxt) {
+                rootContext = ctxt;
                 progress = QDeclarativeIncubatorPrivate::Completed;
                 goto finishIncubate;
             }
@@ -570,7 +580,6 @@ void QDeclarativeIncubator::forceCompletion()
         if (Loading == status())
             d->incubate(i);
     }
-
 }
 
 /*!
diff --git a/src/declarative/qml/qdeclarativeincubator_p.h b/src/declarative/qml/qdeclarativeincubator_p.h
index eaa4ce5ecb..ebabbae1d2 100644
--- a/src/declarative/qml/qdeclarativeincubator_p.h
+++ b/src/declarative/qml/qdeclarativeincubator_p.h
@@ -46,6 +46,7 @@
 #include <private/qdeclarativevme_p.h>
 #include <private/qrecursionwatcher_p.h>
 #include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativecontext_p.h>
 
 //
 //  W A R N I N G
@@ -83,6 +84,7 @@ public:
     Progress progress;
 
     QObject *result;
+    QDeclarativeGuardedContextData rootContext;
     QDeclarativeCompiledData *component;
     QDeclarativeVME vme;
     QDeclarativeVMEGuard vmeGuard;
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index b7abef4aef..ad8d80c51a 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -310,7 +310,7 @@ QObject *QDeclarativeVME::run(QList<QDeclarativeError> *errors,
             }
             if (states.count() == 1) {
                 rootContext = CTXT;
-                rootContext->activeVME = this;
+                rootContext->activeVMEData = data;
             }
             if (states.count() == 1 && !creationContext.isNull()) {
                 // A component that is logically created within another component instance shares the 
@@ -1207,7 +1207,7 @@ void QDeclarativeVME::reset()
         delete objects.at(0); 
     
     if (!rootContext.isNull()) 
-        rootContext->activeVME = 0;
+        rootContext->activeVMEData = 0;
 
     // Remove the QDeclarativeParserStatus and QDeclarativeAbstractBinding back pointers
     blank(parserStatus);
@@ -1342,7 +1342,7 @@ void **QDeclarativeVME::instructionJumpTable()
 }
 #endif
 
-bool QDeclarativeVME::complete(const Interrupt &interrupt) 
+QDeclarativeContextData *QDeclarativeVME::complete(const Interrupt &interrupt)
 {
     Q_ASSERT(engine ||
              (bindValues.isEmpty() &&
@@ -1352,7 +1352,7 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
               finalizeCallbacks.isEmpty()));
 
     if (!engine)
-        return true;
+        return 0;
 
     ActiveVMERestorer restore(this, QDeclarativeEnginePrivate::get(engine));
     QRecursionWatcher<QDeclarativeVME, &QDeclarativeVME::recursion> watcher(this);
@@ -1367,7 +1367,7 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
         }
 
         if (watcher.hasRecursed() || interrupt.shouldInterrupt())
-            return false;
+            return 0;
     }
     bindValues.deallocate();
 
@@ -1380,7 +1380,7 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
         }
         
         if (watcher.hasRecursed() || interrupt.shouldInterrupt())
-            return false;
+            return 0;
     }
     parserStatus.deallocate();
 
@@ -1394,12 +1394,9 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
         emit a->completed();
 
         if (watcher.hasRecursed() || interrupt.shouldInterrupt())
-            return false;
+            return 0;
     }
 
-    if (!rootContext.isNull()) 
-        rootContext->activeVME = 0;
-
     for (int ii = 0; ii < finalizeCallbacks.count(); ++ii) {
         QDeclarativeEnginePrivate::FinalizeCallback callback = finalizeCallbacks.at(ii);
         QObject *obj = callback.first;
@@ -1408,13 +1405,17 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
             QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, callback.second, args);
         }
         if (watcher.hasRecursed())
-            return false;
+            return 0;
     }
     finalizeCallbacks.clear();
 
+    QDeclarativeContextData *rv = rootContext;
+
     reset();
 
-    return true;
+    if (rv) rv->activeVMEData = data;
+
+    return rv;
 }
 
 void QDeclarativeVME::blank(QFiniteStack<QDeclarativeAbstractBinding *> &bs)
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h
index b74bc547bf..4edceb283a 100644
--- a/src/declarative/qml/qdeclarativevme_p.h
+++ b/src/declarative/qml/qdeclarativevme_p.h
@@ -125,7 +125,7 @@ public:
     void reset();
 
     QObject *execute(QList<QDeclarativeError> *errors, const Interrupt & = Interrupt());
-    bool complete(const Interrupt & = Interrupt());
+    QDeclarativeContextData *complete(const Interrupt & = Interrupt());
 
 private:
     friend class QDeclarativeVMEGuard;