Get rid of QWidgetBackingStoreTracker

It was added for Symbian almost 10 years ago (d7057e7c1f1a), for a somewhat
dubious use-case. The Symbian code is since long gone (ae30d7141), so the
remaining pieces are just adding complexity to the already intricate workings
of the QtWidgets backingstore/painting logic.

Task-number: QTBUG-8697
Change-Id: I82af610a8ac26719c588ac63f06b4501f59b400d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
(cherry picked from commit 2e0b0be2ce30394269559590b42c81de27301ee6)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
index 009ffb17a1..1b963010d1 100644
--- a/src/widgets/kernel/qwidgetbackingstore.cpp
+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
@@ -300,7 +300,7 @@ void QWidgetBackingStore::unflushPaint(QWidget *widget, const QRegion &rgn)
     if (!tlwExtra)
         return;
 
-    qt_flush(widget, rgn, tlwExtra->backingStoreTracker->store, tlw, 0, tlw->d_func()->maybeBackingStore());
+    qt_flush(widget, rgn, tlwExtra->widgetBackingStore->store, tlw, 0, tlw->d_func()->maybeBackingStore());
 }
 #endif // QT_NO_PAINT_DEBUG
 
@@ -800,7 +800,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
         invalidateBackingStore((newRect & clipR).translated(-data.crect.topLeft()));
     } else {
 
-        QWidgetBackingStore *wbs = x->backingStoreTracker.data();
+        QWidgetBackingStore *wbs = x->widgetBackingStore.get();
         QRegion childExpose(newRect & clipR);
         QRegion overlappedExpose;
 
@@ -864,7 +864,7 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
     if (x->inTopLevelResize)
         return;
 
-    QWidgetBackingStore *wbs = x->backingStoreTracker.data();
+    QWidgetBackingStore *wbs = x->widgetBackingStore.get();
     if (!wbs)
         return;
 
@@ -1528,10 +1528,10 @@ void QWidgetPrivate::invalidateBackingStore(const T &r)
         if (masked.isEmpty())
             return;
 
-        tlwExtra->backingStoreTracker->markDirty(masked, q,
+        tlwExtra->widgetBackingStore->markDirty(masked, q,
             QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
     } else {
-        tlwExtra->backingStoreTracker->markDirty(clipped, q,
+        tlwExtra->widgetBackingStore->markDirty(clipped, q,
             QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
     }
 }