Improve performance of hfw in qgridlayoutengine by adding more caching.

The previous code tried to do caching of queries with constraints too,
but it's usecase was rather limited.
The caching worked for the simple case of
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));    // uses cache

The problem was that if somebody called this sequence:
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(-1, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));

Each call would disregard the cache because the constraint was
different.

Now the pattern is used in the qgridlayoutengine itself when we
calculate hfw: (yes, height-for-width).
First, we ask for the horizontal size hints with no constraints.
Then, we'll ask for the vertical size hints with constraints.
Since horizontal and vertical ultimately comes from the same function
(effectiveSizeHint) it will invalidate the cache each time.

The solution is to add another cache for the sizeHints with
constraints.

The most notable improvement is in the hfw, nested case. Result:
RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
     546 msecs per iteration (total: 546, iterations: 1)

RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
     0.000029 msecs per iteration (total: 62, iterations: 2097152)

Improvement: 18,827,586 times faster (!!)

2 files changed, 26 insertions, 11 deletions

diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index e43f7fa..016cfbf 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -137,19 +137,28 @@ void QGraphicsLayoutItemPrivate::init()
 QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) const
 {
     Q_Q(const QGraphicsLayoutItem);
-    if (!sizeHintCacheDirty && cachedConstraint == constraint)
-        return cachedSizeHints;
+    QSizeF *sizeHintCache;
+    const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0;
+    if (hasConstraint) {
+        if (!sizeHintWithConstraintCacheDirty && constraint == cachedConstraint)
+            return cachedSizeHintsWithConstraints;
+        sizeHintCache = cachedSizeHintsWithConstraints;
+    } else {
+        if (!sizeHintCacheDirty)
+            return cachedSizeHints;
+        sizeHintCache = cachedSizeHints;
+    }
 
     for (int i = 0; i < Qt::NSizeHints; ++i) {
-        cachedSizeHints[i] = constraint;
+        sizeHintCache[i] = constraint;
         if (userSizeHints)
-            combineSize(cachedSizeHints[i], userSizeHints[i]);
+            combineSize(sizeHintCache[i], userSizeHints[i]);
     }
 
-    QSizeF &minS = cachedSizeHints[Qt::MinimumSize];
-    QSizeF &prefS = cachedSizeHints[Qt::PreferredSize];
-    QSizeF &maxS = cachedSizeHints[Qt::MaximumSize];
-    QSizeF &descentS = cachedSizeHints[Qt::MinimumDescent];
+    QSizeF &minS = sizeHintCache[Qt::MinimumSize];
+    QSizeF &prefS = sizeHintCache[Qt::PreferredSize];
+    QSizeF &maxS = sizeHintCache[Qt::MaximumSize];
+    QSizeF &descentS = sizeHintCache[Qt::MinimumDescent];
 
     normalizeHints(minS.rwidth(), prefS.rwidth(), maxS.rwidth(), descentS.rwidth());
     normalizeHints(minS.rheight(), prefS.rheight(), maxS.rheight(), descentS.rheight());
@@ -175,9 +184,13 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint)
     // Not supported yet
     // COMBINE_SIZE(descentS, q->sizeHint(Qt::MinimumDescent, constraint));
 
-    cachedConstraint = constraint;
-    sizeHintCacheDirty = false;
-    return cachedSizeHints;
+    if (hasConstraint) {
+        cachedConstraint = constraint;
+        sizeHintWithConstraintCacheDirty = false;
+    } else {
+        sizeHintCacheDirty = false;
+    }
+    return sizeHintCache;
 }
 
 
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h
index b752e03..d72ee9f 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem_p.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h
@@ -85,8 +85,10 @@ public:
     QSizeF *userSizeHints;
     mutable QSizeF cachedSizeHints[Qt::NSizeHints];
     mutable QSizeF cachedConstraint;
+    mutable QSizeF cachedSizeHintsWithConstraints[Qt::NSizeHints];
 
     mutable quint32 sizeHintCacheDirty : 1;
+    mutable quint32 sizeHintWithConstraintCacheDirty : 1;
     quint32 isLayout : 1;
     quint32 ownedByLayout : 1;