Fixes: Speed up QGrahicsItemPrivate::effectiveOpacity().

RevBy:    Andreas
AutoTest: tst_QGraphicsItem::opacity still passes

2 files changed, 13 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index bb9554344c..cda1bd1ff4 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1862,6 +1862,9 @@ qreal QGraphicsItem::opacity() const
 */
 qreal QGraphicsItem::effectiveOpacity() const
 {
+    if (!d_ptr->hasEffectiveOpacity)
+        return qreal(1.0);
+
     QVariant effectiveOpacity = d_ptr->extra(QGraphicsItemPrivate::ExtraEffectiveOpacity);
     return effectiveOpacity.isNull() ? qreal(1.0) : qreal(effectiveOpacity.toDouble());
 }
@@ -3680,7 +3683,14 @@ void QGraphicsItemPrivate::resolveEffectiveOpacity(qreal parentEffectiveOpacity)
     }
 
     // Set this item's resolved opacity.
-    setExtra(ExtraEffectiveOpacity, myEffectiveOpacity);
+    if (qFuzzyCompare(myEffectiveOpacity, qreal(1.0))) {
+        // Opaque, unset effective opacity.
+        hasEffectiveOpacity = 0;
+        unsetExtra(ExtraEffectiveOpacity);
+    } else {
+        hasEffectiveOpacity = 1;
+        setExtra(ExtraEffectiveOpacity, myEffectiveOpacity);
+    }
 
     // Resolve children always.
     for (int i = 0; i < children.size(); ++i)
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 07f6958c26..98fe6ed57d 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -133,6 +133,7 @@ public:
         hasBoundingRegionGranularity(0),
         flags(0),
         hasOpacity(0),
+        hasEffectiveOpacity(0),
         isWidget(0),
         dirty(0),
         dirtyChildren(0),
@@ -262,6 +263,7 @@ public:
 
     // New 32 bytes
     quint32 hasOpacity : 1;
+    quint32 hasEffectiveOpacity : 1;
     quint32 isWidget : 1;
     quint32 dirty : 1;    
     quint32 dirtyChildren : 1;