Remove windowmanager hacks form the incubation controller.

Tie incubation directly to wether animations are running
or not. When animations are running, we incubate for
a third of a frame only. When animations are not running
we incubate whatever is left as the scene is anyway idle.

Change-Id: I88c9248e9d7b3b35c99fca52aeb9c681d1b4a306
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 1 insertions, 11 deletions

diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index 3cced7a120..7ddedad073 100644
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -92,14 +92,13 @@ public:
     void exposureChanged(QQuickWindow *window);
     QImage grab(QQuickWindow *window);
     void resize(QQuickWindow *window, const QSize &size);
-    void wakeup();
 
     void maybeUpdate(QQuickWindow *window);
     void update(QQuickWindow *window) { maybeUpdate(window); } // identical for this implementation.
 
     void releaseResources() { }
 
-    volatile bool *allowMainThreadProcessing();
+    QAnimationDriver *animationDriver() const { return 0; }
 
     QSGContext *sceneGraphContext() const;
 
@@ -292,15 +291,6 @@ void QQuickTrivialWindowManager::maybeUpdate(QQuickWindow *window)
     }
 }
 
-void QQuickTrivialWindowManager::wakeup()
-{
-}
-
-volatile bool *QQuickTrivialWindowManager::allowMainThreadProcessing()
-{
-    return 0;
-}
-
 
 
 QSGContext *QQuickTrivialWindowManager::sceneGraphContext() const