2008-05-08 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Simon.
Simple ImageBuffer::image implementation.
In contrast to cg and cairo we do not use a special BitmapImage because
the ownership of the FrameData inside the BitmapImage is a bit backward
(actually owned by the ImageDecoderQt...). Further work is needed for image
and pixmap handling in the qt port...
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32981 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index efd0f52..6e9843b 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -36,6 +36,7 @@
#include "GraphicsContext.h"
#include "AffineTransform.h"
#include "NotImplemented.h"
+#include "StillImageQt.h"
#include "qwebsettings.h"
#include <QPixmap>
@@ -50,20 +51,6 @@
#include <math.h>
-namespace WebCore {
-class StillImage : public Image {
-public:
- StillImage(const QPixmap& pixmap);
-
- virtual IntSize size() const;
- virtual QPixmap* getPixmap() const;
- virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator);
-
-private:
- QPixmap m_pixmap;
-};
-}
-
// This function loads resources into WebKit
static QPixmap loadResourcePixmap(const char *name)
{
@@ -182,33 +169,6 @@
return const_cast<BitmapImage*>(this)->frameAtIndex(0);
}
-StillImage::StillImage(const QPixmap& pixmap)
- : m_pixmap(pixmap)
-{}
-
-IntSize StillImage::size() const
-{
- return IntSize(m_pixmap.width(), m_pixmap.height());
-}
-
-QPixmap* StillImage::getPixmap() const
-{
- return const_cast<QPixmap*>(&m_pixmap);
-}
-
-void StillImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
- const FloatRect& src, CompositeOperator op)
-{
- if (m_pixmap.isNull())
- return;
-
- ctxt->save();
- ctxt->setCompositeOperation(op);
- QPainter* painter(ctxt->platformContext());
- painter->drawPixmap(dst, m_pixmap, src);
- ctxt->restore();
-}
-
}
