Merge remote-tracking branch 'origin/dev' into stable

Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88

1 files changed, 27 insertions, 0 deletions

diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h
index b6c3e13cb0..2fe58fa4a7 100644
--- a/src/widgets/kernel/qwidgetbackingstore_p.h
+++ b/src/widgets/kernel/qwidgetbackingstore_p.h
@@ -60,6 +60,9 @@
 
 QT_BEGIN_NAMESPACE
 
+class QPlatformTextureList;
+class QWidgetBackingStore;
+
 struct BeginPaintInfo {
     inline BeginPaintInfo() : wasFlushed(0), nothingToPaint(0), backingStoreRecreated(0) {}
     uint wasFlushed : 1;
@@ -67,6 +70,23 @@ struct BeginPaintInfo {
     uint backingStoreRecreated : 1;
 };
 
+class QPlatformTextureListWatcher : public QObject
+{
+    Q_OBJECT
+
+public:
+    QPlatformTextureListWatcher(QWidgetBackingStore *backingStore);
+    void watch(QPlatformTextureList *textureList);
+    bool isLocked() const { return m_locked; }
+
+private slots:
+     void onLockStatusChanged(bool locked);
+
+private:
+     bool m_locked;
+     QWidgetBackingStore *m_backingStore;
+};
+
 class Q_AUTOTEST_EXPORT QWidgetBackingStore
 {
 public:
@@ -102,14 +122,21 @@ private:
     QVector<QWidget *> dirtyWidgets;
     QVector<QWidget *> *dirtyOnScreenWidgets;
     QList<QWidget *> staticWidgets;
+    QPlatformTextureList *widgetTextures;
     QBackingStore *store;
     uint fullUpdatePending : 1;
+    uint updateRequestSent : 1;
 
     QPoint tlwOffset;
 
+    QPlatformTextureListWatcher *textureListWatcher;
+
+    void sendUpdateRequest(QWidget *widget, bool updateImmediately);
+
     static bool flushPaint(QWidget *widget, const QRegion &rgn);
     static void unflushPaint(QWidget *widget, const QRegion &rgn);
 
+    void doSync();
     bool bltRect(const QRect &rect, int dx, int dy, QWidget *widget);
     void releaseBuffer();