1 files changed, 13 insertions, 62 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index b060d6a082..a74995319b 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -38,87 +38,38 @@
 ****************************************************************************/
 
 #include "qcocoabackingstore.h"
-#include <QtGui/QPainter>
+
+#include "qcocoawindow.h"
 #include "qcocoahelpers.h"
 
 QT_BEGIN_NAMESPACE
 
 QCocoaBackingStore::QCocoaBackingStore(QWindow *window)
-    : QPlatformBackingStore(window)
+    : QRasterBackingStore(window)
 {
 }
 
 QCocoaBackingStore::~QCocoaBackingStore()
 {
     if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window()->handle()))
-        [cocoaWindow->m_qtView clearBackingStore:this];
-}
-
-QPaintDevice *QCocoaBackingStore::paintDevice()
-{
-    QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window()->handle());
-    int windowDevicePixelRatio = int(cocoaWindow->devicePixelRatio());
-
-    // Receate the backing store buffer if the effective buffer size has changed,
-    // either due to a window resize or devicePixelRatio change.
-    QSize effectiveBufferSize = m_requestedSize * windowDevicePixelRatio;
-    if (m_qImage.size() != effectiveBufferSize) {
-        QImage::Format format = (window()->format().hasAlpha() || cocoaWindow->m_drawContentBorderGradient)
-                ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
-        m_qImage = QImage(effectiveBufferSize, format);
-        m_qImage.setDevicePixelRatio(windowDevicePixelRatio);
-        if (format == QImage::Format_ARGB32_Premultiplied)
-            m_qImage.fill(Qt::transparent);
-    }
-    return &m_qImage;
+        [qnsview_cast(cocoaWindow->view()) clearBackingStore:this];
 }
 
-void QCocoaBackingStore::flush(QWindow *win, const QRegion &region, const QPoint &offset)
+QImage::Format QCocoaBackingStore::format() const
 {
-    if (!m_qImage.isNull()) {
-        if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle()))
-            [cocoaWindow->m_qtView flushBackingStore:this region:region offset:offset];
-    }
-}
+    if (static_cast<QCocoaWindow *>(window()->handle())->m_drawContentBorderGradient)
+        return QImage::Format_ARGB32_Premultiplied;
 
-QImage QCocoaBackingStore::toImage() const
-{
-    return m_qImage;
+    return QRasterBackingStore::format();
 }
 
-void QCocoaBackingStore::resize(const QSize &size, const QRegion &)
+void QCocoaBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
 {
-    m_requestedSize = size;
-}
+    if (m_image.isNull())
+        return;
 
-bool QCocoaBackingStore::scroll(const QRegion &area, int dx, int dy)
-{
-    extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset);
-    const qreal devicePixelRatio = m_qImage.devicePixelRatio();
-    QPoint qpoint(dx * devicePixelRatio, dy * devicePixelRatio);
-    const QVector<QRect> qrects = area.rects();
-    for (int i = 0; i < qrects.count(); ++i) {
-        const QRect &qrect = QRect(qrects.at(i).topLeft() * devicePixelRatio, qrects.at(i).size() * devicePixelRatio);
-        qt_scrollRectInImage(m_qImage, qrect, qpoint);
-    }
-    return true;
-}
-
-void QCocoaBackingStore::beginPaint(const QRegion &region)
-{
-    if (m_qImage.hasAlphaChannel()) {
-        QPainter p(&m_qImage);
-        p.setCompositionMode(QPainter::CompositionMode_Source);
-        const QVector<QRect> rects = region.rects();
-        const QColor blank = Qt::transparent;
-        for (QVector<QRect>::const_iterator it = rects.begin(), end = rects.end(); it != end; ++it)
-            p.fillRect(*it, blank);
-    }
-}
-
-qreal QCocoaBackingStore::getBackingStoreDevicePixelRatio()
-{
-    return m_qImage.devicePixelRatio();
+    if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle()))
+        [qnsview_cast(cocoaWindow->view()) flushBackingStore:this region:region offset:offset];
 }
 
 QT_END_NAMESPACE