Fix performance regression in animators since 5.6

The costly addition is down to that we're performing TransformJob::postSync()
which we did not do before. This is superfluous though, as we do the same
bit of code in preSync() and there is no way the pointers we're checking
for can change between pre and post. Only missing bit is to move the invalidate().

Change-Id: I96420c14e11a5a33997ed6fac6a78695a917a8f2
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>

2 files changed, 3 insertions, 23 deletions

diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index caf702bde5..9c9261c101 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -321,8 +321,10 @@ void QQuickTransformAnimatorJob::preSync()
         m_helper = nullptr;
     }
 
-    if (!m_target)
+    if (!m_target) {
+        invalidate();
         return;
+    }
 
     if (!m_helper) {
         m_helper = qquick_transform_animatorjob_helper_store()->acquire(m_target);
@@ -342,27 +344,6 @@ void QQuickTransformAnimatorJob::preSync()
     m_helper->sync();
 }
 
-void QQuickTransformAnimatorJob::postSync()
-{
-    Q_ASSERT((m_helper != nullptr) == (m_target != nullptr)); // If there is a target, there should also be a helper, ref: preSync
-    Q_ASSERT(!m_helper || m_helper->item == m_target); // If there is a helper, it should point to our target
-
-    if (!m_target || !m_helper) {
-        invalidate();
-        return;
-    }
-
-    QQuickItemPrivate *d = QQuickItemPrivate::get(m_target);
-#if QT_CONFIG(quick_shadereffect)
-    if (d->extra.isAllocated()
-            && d->extra->layer
-            && d->extra->layer->enabled()) {
-        d = QQuickItemPrivate::get(d->extra->layer->m_effectSource);
-    }
-#endif
-    m_helper->node = d->itemNode();
-}
-
 void QQuickTransformAnimatorJob::invalidate()
 {
     if (m_helper)
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index a3ced4c21b..777da2ee6c 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -235,7 +235,6 @@ public:
 
 protected:
     QQuickTransformAnimatorJob();
-    void postSync() override;
     void invalidate() override;
 
     Helper *m_helper;