1 files changed, 86 insertions, 31 deletions

diff --git a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp
index afc40bff50..a830d14be8 100644
--- a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp
+++ b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp
@@ -1,34 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <qwindow.h>
 #include <qbackingstore.h>
 #include <qpa/qplatformbackingstore.h>
+#include <qpa/qplatformintegration.h>
+#include <private/qguiapplication_p.h>
 #include <qpainter.h>
 
 #include <QTest>
@@ -55,6 +32,8 @@ private slots:
 
     void scroll();
     void flush();
+
+    void staticContents();
 };
 
 void tst_QBackingStore::initTestCase_data()
@@ -114,6 +93,11 @@ void tst_QBackingStore::paint()
     QRect rect(0, 0, 100, 100);
     backingStore.resize(rect.size());
 
+    // Partial fill of a fresh backingstore should not crash
+    backingStore.beginPaint(QRect(0, 0, 50, 50));
+    backingStore.endPaint();
+    backingStore.flush(rect);
+
     // Two rounds, with flush in between
     for (int i = 0; i < 2; ++i) {
         backingStore.beginPaint(rect);
@@ -264,7 +248,7 @@ public:
         backingStore.resize(size());
     }
 
-    void exposeEvent(QExposeEvent *event) override
+    void paintEvent(QPaintEvent *event) override
     {
         QRect rect(QPoint(), size());
 
@@ -276,10 +260,7 @@ public:
 
         backingStore.endPaint();
 
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
         backingStore.flush(event->region().boundingRect());
-QT_WARNING_POP
     }
 
 private:
@@ -295,5 +276,79 @@ void tst_QBackingStore::flush()
     QTRY_VERIFY(window.isExposed());
 }
 
+void tst_QBackingStore::staticContents()
+{
+    const auto *integration = QGuiApplicationPrivate::platformIntegration();
+    if (!integration->hasCapability(QPlatformIntegration::BackingStoreStaticContents))
+        QSKIP("Platform does not support static backingstore content");
+
+    QWindow window;
+    window.create();
+
+    const auto dpr = window.devicePixelRatio();
+
+    QBackingStore backingStore(&window);
+
+    QRect initialRect(0, 0, 100, 100);
+
+    // Static contents without paint first should not crash
+    backingStore.setStaticContents(initialRect);
+    backingStore.resize(initialRect.size());
+    QCOMPARE(backingStore.size(), initialRect.size());
+    backingStore.beginPaint(QRect(0, 0, 50, 50));
+    backingStore.endPaint();
+    backingStore.handle()->toImage();
+
+    {
+        backingStore.setStaticContents(QRect());
+        backingStore.beginPaint(initialRect);
+        QPainter p(backingStore.paintDevice());
+        p.fillRect(initialRect, Qt::green);
+        p.end();
+        backingStore.endPaint();
+
+        QImage image = backingStore.handle()->toImage();
+        if (image.isNull())
+            QSKIP("Platform backingstore does not implement toImage");
+
+        QCOMPARE(image.pixelColor(initialRect.topLeft() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.bottomLeft() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.topRight() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.bottomRight() * dpr), Qt::green);
+    }
+
+    {
+        backingStore.setStaticContents(initialRect);
+
+        QRect resizedRect(0, 0, 200, 200);
+        backingStore.resize(resizedRect.size());
+
+        QRegion repaintRegion = QRegion(resizedRect) - QRegion(initialRect);
+
+        backingStore.beginPaint(repaintRegion);
+        QPainter p(backingStore.paintDevice());
+        for (auto repaintRect : repaintRegion)
+            p.fillRect(repaintRect, Qt::red);
+        p.end();
+        backingStore.endPaint();
+
+        QImage image = backingStore.handle()->toImage();
+        if (image.isNull())
+            QSKIP("Platform backingstore does not implement toImage");
+
+        QCOMPARE(image.pixelColor(initialRect.topLeft() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.bottomLeft() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.topRight() * dpr), Qt::green);
+        QCOMPARE(image.pixelColor(initialRect.bottomRight() * dpr), Qt::green);
+
+        for (auto repaintRect : repaintRegion) {
+            QCOMPARE(image.pixelColor(repaintRect.topLeft() * dpr), Qt::red);
+            QCOMPARE(image.pixelColor(repaintRect.bottomLeft() * dpr), Qt::red);
+            QCOMPARE(image.pixelColor(repaintRect.topRight() * dpr), Qt::red);
+            QCOMPARE(image.pixelColor(repaintRect.bottomRight() * dpr), Qt::red);
+        }
+    }
+}
+
 #include <tst_qbackingstore.moc>
 QTEST_MAIN(tst_QBackingStore);