Reviewed by Eric.

        Daily Qt build fixes :-)

        * platform/qt/GraphicsContextQt.cpp:
        (WebCore::GraphicsContext::drawConvexPolygon):
        * platform/qt/ImageQt.cpp:
        (WebCore::Image::initPlatformData):
        (WebCore::Image::invalidatePlatformData):
        (WebCore::Image::loadPlatformResource):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16051 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9b94d59f3533e7f020a56e9f008519d165998560..e9ae2388f1e0e99bc44ce43fa720fad4eece5482 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-26  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Eric.
+
+        Daily Qt build fixes :-)
+
+        * platform/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::drawConvexPolygon):
+        * platform/qt/ImageQt.cpp:
+        (WebCore::Image::initPlatformData):
+        (WebCore::Image::invalidatePlatformData):
+        (WebCore::Image::loadPlatformResource):
+
 2006-08-26  David Hyatt  <hyatt@apple.com>
 
         Fix the ifdef in Path.h to be CG.

diff --git a/WebCore/platform/qt/GraphicsContextQt.cpp b/WebCore/platform/qt/GraphicsContextQt.cpp
index 952aa2bc4d0532e68de2190da249a89845820209..4c3880cdd9d4544a5e594809903bb7d9e7d51705 100644 (file)
--- a/WebCore/platform/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/qt/GraphicsContextQt.cpp
@@ -418,12 +418,13 @@ void GraphicsContext::drawArc(const IntRect& rect, float thickness,
     m_data->p().setPen(oldPen);
 }
 
-void GraphicsContext::drawConvexPolygon(size_t npoints, const IntPoint* points)
+void GraphicsContext::drawConvexPolygon(size_t npoints, const FloatPoint* points, bool shouldAntialias)
 {
     if (paintingDisabled())
         return;
 
-    m_data->p().drawConvexPolygon(reinterpret_cast<const QPoint*>(points), npoints);
+    // FIXME: Take 'shouldAntialias' into account...
+    m_data->p().drawConvexPolygon(reinterpret_cast<const QPointF*>(points), npoints);
 }
 
 void GraphicsContext::fillRect(const IntRect& rect, const Color& c)

diff --git a/WebCore/platform/qt/ImageQt.cpp b/WebCore/platform/qt/ImageQt.cpp
index 53a92ee64e3ae3e844199f6e30e58ff5795abb6d..37a2b5b1cdd5cc9066b1913004f2b7768ffa0354 100644 (file)
--- a/WebCore/platform/qt/ImageQt.cpp
+++ b/WebCore/platform/qt/ImageQt.cpp
@@ -60,19 +60,15 @@ void FrameData::clear()
 // Image Class
 // ================================================
 
-void Image::initNativeData()
+void Image::initPlatformData()
 {
 }
 
-void Image::destroyNativeData()
+void Image::invalidatePlatformData()
 {
 }
 
-void Image::invalidateNativeData()
-{
-}
-
-Image* Image::loadResource(const char* name)
+Image* Image::loadPlatformResource(const char* name)
 {
     Vector<char> arr = loadResourceIntoArray(name);
     Image* img = new Image();