1 files changed, 38 insertions, 22 deletions

diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index ab1ff47..f67a7c2 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -20,10 +21,9 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -57,12 +57,14 @@
 #include "qgl.h"
 
 #include "private/qpixmapdata_p.h"
+#include "private/qglpaintdevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QPaintEngine;
 class QGLFramebufferObject;
 class QGLFramebufferObjectFormat;
+class QGLPixmapData;
 
 class QGLFramebufferObjectPool
 {
@@ -76,31 +78,50 @@ private:
 
 QGLFramebufferObjectPool* qgl_fbo_pool();
 
+
+class QGLPixmapGLPaintDevice : public QGLPaintDevice
+{
+public:
+    QPaintEngine* paintEngine() const;
+
+    void beginPaint();
+    void endPaint();
+    QGLContext* context() const;
+    QSize size() const;
+
+    void setPixmapData(QGLPixmapData*);
+private:
+    QGLPixmapData *data;
+};
+
+
 class QGLPixmapData : public QPixmapData
 {
 public:
     QGLPixmapData(PixelType type);
     ~QGLPixmapData();
 
-    bool isValid() const;
-
+    // Re-implemented from QPixmapData:
     void resize(int width, int height);
-    void fromImage(const QImage &image,
-                   Qt::ImageConversionFlags flags);
+    void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
     void copy(const QPixmapData *data, const QRect &rect);
-
     bool scroll(int dx, int dy, const QRect &rect);
-
     void fill(const QColor &color);
     bool hasAlphaChannel() const;
     QImage toImage() const;
     QPaintEngine *paintEngine() const;
+    int metric(QPaintDevice::PaintDeviceMetric metric) const;
 
+    // For accessing as a target:
+    QGLPaintDevice *glDevice() const;
+
+    // For accessing as a source:
+    bool isValidContext(const QGLContext *ctx) const;
     GLuint bind(bool copyBack = true) const;
-    GLuint textureId() const;
     QGLTexture *texture() const;
 
-    bool isValidContext(const QGLContext *ctx) const;
+private:
+    bool isValid() const;
 
     void ensureCreated() const;
 
@@ -109,22 +130,13 @@ public:
     bool needsFill() const { return m_hasFillColor; }
     QColor fillColor() const { return m_fillColor; }
 
-    QSize size() const { return QSize(w, h); }
-
-    QGLFramebufferObject *fbo() const;
 
-    void makeCurrent();
-    void doneCurrent();
-    void swapBuffers();
 
-protected:
-    int metric(QPaintDevice::PaintDeviceMetric metric) const;
-
-private:
     QGLPixmapData(const QGLPixmapData &other);
     QGLPixmapData &operator=(const QGLPixmapData &other);
 
     void copyBackFromRenderFbo(bool keepCurrentFboBound) const;
+    QSize size() const { return QSize(w, h); }
 
     static bool useFramebufferObjects();
 
@@ -145,6 +157,10 @@ private:
     mutable bool m_hasFillColor;
 
     mutable bool m_hasAlpha;
+
+    mutable QGLPixmapGLPaintDevice m_glDevice;
+
+    friend class QGLPixmapGLPaintDevice;
 };
 
 QT_END_NAMESPACE