From d45ec470519d1075ebf299b74cbb846a0c7d99af Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Wed, 27 Apr 2011 15:02:32 +0200
Subject: Upload VGImage data when drawing pixmaps that are being painted into.

When a painter is open on a pixmap's underlying QVolatileImage, it is
better to upload the VGImage content every time the pixmap is drawn
on the screen, in order to enable showing animations that are created
by continously rendering into the same pixmap and keeping the same
painter open.

Task-number: QT-4002
Reviewed-by: Jason Barron
---
 src/gui/image/qvolatileimage.cpp   |  5 +++++
 src/gui/image/qvolatileimage_p.h   |  1 +
 src/openvg/qpixmapdata_vg.cpp      |  2 +-
 src/s60installs/bwins/QtGuiu.def   |  1 +
 src/s60installs/eabi/QtGuiu.def    |  1 +
 tests/auto/qpixmap/tst_qpixmap.cpp | 46 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index 098e9a1..f5076e1 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -103,6 +103,11 @@ QVolatileImage &QVolatileImage::operator=(const QVolatileImage &rhs)
     return *this;
 }
 
+bool QVolatileImage::paintingActive() const
+{
+    return d->pengine && d->pengine->isActive();
+}
+
 bool QVolatileImage::isNull() const
 {
     return d->image.isNull();
diff --git a/src/gui/image/qvolatileimage_p.h b/src/gui/image/qvolatileimage_p.h
index fc5d6b1..d835f45 100644
--- a/src/gui/image/qvolatileimage_p.h
+++ b/src/gui/image/qvolatileimage_p.h
@@ -71,6 +71,7 @@ public:
     ~QVolatileImage();
     QVolatileImage &operator=(const QVolatileImage &rhs);
 
+    bool paintingActive() const;
     bool isNull() const;
     QImage::Format format() const;
     int width() const;
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 80f5b2f..eae10c8 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -377,7 +377,7 @@ VGImage QVGPixmapData::toVGImage()
         QVGImagePool::instance()->useImage(this);
     }
 
-    if (!source.isNull() && recreate) {
+    if (!source.isNull() && (recreate || source.paintingActive())) {
         source.beginDataAccess();
         vgImageSubData
             (vgImage,
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 26a0761..45a8d7b 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12981,4 +12981,5 @@ EXPORTS
 	?depth@QVolatileImage@@QBEHXZ @ 12980 NONAME ; int QVolatileImage::depth(void) const
 	?releaseCachedResources@QGraphicsSystem@@UAEXXZ @ 12981 NONAME ; void QGraphicsSystem::releaseCachedResources(void)
 	?qt_s60_setPartialScreenInputMode@@YAX_N@Z @ 12982 NONAME ; void qt_s60_setPartialScreenInputMode(bool)
+	?paintingActive@QVolatileImage@@QBE_NXZ @ 12983 NONAME ; bool QVolatileImage::paintingActive(void) const
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index b6a24ab..82ded24 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12182,4 +12182,5 @@ EXPORTS
 	_ZNK14QVolatileImage9constBitsEv @ 12181 NONAME
 	_ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12182 NONAME
 	_Z32qt_s60_setPartialScreenInputModeb @ 12183 NONAME
+	_ZNK14QVolatileImage14paintingActiveEv @ 12184 NONAME
 
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 0b5c30b..d103cb7 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -194,6 +194,8 @@ private slots:
 #if defined(Q_OS_SYMBIAN) && !defined(QT_NO_OPENVG)
     void vgImageReadBack();
 #endif
+
+    void drawPixmapWhilePainterOpen();
 };
 
 static bool lenientCompare(const QPixmap &actual, const QPixmap &expected)
@@ -1881,5 +1883,49 @@ void tst_QPixmap::vgImageReadBack()
 }
 #endif // Symbian & OpenVG
 
+class PixmapWidget : public QWidget
+{
+public:
+    PixmapWidget(QPixmap &pixmap) : QWidget(0), m_pixmap(pixmap)
+    {
+        resize(pixmap.width(), pixmap.height());
+    }
+
+protected:
+    void paintEvent(QPaintEvent *)
+    {
+        QPainter p(this);
+        p.drawPixmap(0, 0, m_pixmap);
+    }
+
+private:
+    QPixmap &m_pixmap;
+};
+
+void tst_QPixmap::drawPixmapWhilePainterOpen()
+{
+    int size = 100;
+    QPixmap pix(size, size);
+    pix.fill(Qt::red);
+
+    PixmapWidget w(pix);
+    w.show();
+    QTest::qWaitForWindowShown(&w);
+    QTest::qWait(1000);
+
+    QPainter p(&pix);
+    p.fillRect(0, 0, size, size, Qt::blue);
+    w.update();
+    QTest::qWait(1000);
+
+    p.fillRect(0, 0, size, size, Qt::green);
+    w.update();
+    QTest::qWait(1000);
+
+    QPixmap actual = QPixmap::grabWindow(w.effectiveWinId(), 0, 0, size, size);
+
+    QVERIFY(lenientCompare(actual, pix));
+}
+
 QTEST_MAIN(tst_QPixmap)
 #include "tst_qpixmap.moc"
-- 
cgit v0.12