2006-12-28 Daniel Molkentin <molkentin@kde.org>
Reviewed by Eric Seidel <eric@webkit.org>
- Fix font sizes
- Make Qt plattform build again:
- Adjust Qt platform to the Image class split.
- Introduce BitmapImage class
- add stub PDFDocumentImage class
* WebCore.pro:
* editing/qt/EditorQt.cpp:
(WebCore::Editor::markMisspellingsAfterTypingToPosition):
* loader/qt/FrameLoaderQt.cpp:
(WebCore::FrameLoader::partClearedInBegin):
* platform/graphics/qt/ImageQt.cpp:
(WebCore::BitmapImage::initPlatformData):
(WebCore::BitmapImage::invalidatePlatformData):
(WebCore::Image::loadPlatformResource):
(WebCore::BitmapImage::draw):
(WebCore::BitmapImage::drawTiled):
(WebCore::BitmapImage::checkForSolidColor):
* platform/graphics/svg/SVGPaintServerLinearGradient.h:
* platform/graphics/svg/SVGPaintServerRadialGradient.h:
* platform/graphics/svg/qt/SVGPaintServerLinearGradientQt.cpp:
(WebCore::SVGPaintServerLinearGradient::setup):
* platform/graphics/svg/qt/SVGPaintServerPatternQt.cpp:
(WebCore::SVGPaintServerPattern::setup):
* platform/graphics/svg/qt/SVGPaintServerQt.cpp:
(WebCore::SVGPaintServer::teardown):
* platform/graphics/svg/qt/SVGPaintServerRadialGradientQt.cpp:
(WebCore::SVGPaintServerRadialGradient::setup):
* platform/graphics/svg/qt/SVGPaintServerSolidQt.cpp:
(WebCore::SVGPaintServerSolid::setup):
* platform/qt/FrameQt.cpp:
(WebCore::FrameQt::FrameQt):
(WebCore::FrameQt::bindingRootObject):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@18463 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index 8c5cd51..6bee4d9 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -30,6 +30,7 @@
#include "config.h"
#include "Image.h"
+#include "BitmapImage.h"
#include "FloatRect.h"
#include "PlatformString.h"
#include "GraphicsContext.h"
@@ -61,24 +62,24 @@
// Image Class
// ================================================
-void Image::initPlatformData()
+void BitmapImage::initPlatformData()
{
}
-void Image::invalidatePlatformData()
+void BitmapImage::invalidatePlatformData()
{
}
Image* Image::loadPlatformResource(const char* name)
{
Vector<char> arr = loadResourceIntoArray(name);
- Image* img = new Image();
+ Image* img = new BitmapImage();
img->setNativeData(&arr, true);
return img;
}
// Drawing Routines
-void Image::draw(GraphicsContext* ctxt, const FloatRect& dst,
+void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
const FloatRect& src, CompositeOperator op)
{
if (!m_source.initialized())
@@ -108,7 +109,7 @@
startAnimation();
}
-void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatPoint& srcPoint,
+void BitmapImage::drawTiled(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatPoint& srcPoint,
const FloatSize& tileSize, CompositeOperator op)
{
if (!m_source.initialized())
@@ -150,7 +151,13 @@
startAnimation();
}
-void Image::checkForSolidColor()
+void BitmapImage::drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect,
+ TileRule hRule, TileRule vRule, CompositeOperator op)
+{
+ // FIXME: no implemented
+}
+
+void BitmapImage::checkForSolidColor()
{
// FIXME: It's easy to implement this optimization. Just need to check the RGBA32 buffer to see if it is 1x1.
m_isSolidColor = false;
@@ -158,4 +165,5 @@
}
+
// vim: ts=4 sw=4 et
