Build fix for Qt and Cairo builds

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f85ae22..7fcb3a6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2008-02-15  Oliver Hunt  <oliver@apple.com>
 
+        Reviewed by NOBODY (Build fix).
+
+        Build fix for Qt and Cairo builds
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::drawImage):
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+
+2008-02-15  Oliver Hunt  <oliver@apple.com>
+
         Reviewed by Dan B.
 
         Bug 17269: Deobfuscate CanvasRenderingContext2D.cpp

diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index 9baf780..1c1ea16 100644 (file)
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -909,11 +909,11 @@ void GraphicsContext::paintBuffer(ImageBuffer* buffer, const IntRect& r)
     cairo_restore(cr);
 }
 
-void GraphicsContext::drawImage(ImageBuffer* buffer, const FloatRect& srcRect, const FloatRect& destRect)
+void GraphicsContext::drawImage(ImageBuffer* buffer, const FloatRect& srcRect, const FloatRect& dstRect)
 {
-    cairo_surface_flush(m_data->surface());    
+    cairo_surface_flush(buffer->surface());    
     cairo_save(platformContext());
-    cairo_set_source_surface(platformContext(), m_data->surface(), srcRect.x(), srcRect.y());
+    cairo_set_source_surface(platformContext(), buffer->surface(), srcRect.x(), srcRect.y());
     cairo_rectangle(platformContext(), dstRect.x(), dstRect.y(), dstRect.width(), dstRect.height());
     cairo_fill(platformContext());
     cairo_restore(platformContext());

diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 6f97a97..ec35d96 100644 (file)
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -929,7 +929,7 @@ void GraphicsContext::paintBuffer(ImageBuffer* buffer, const IntRect& r)
     painter->setBackground(currentBackground);
 }
 
-void GraphicsContext::drawImage(ImageBuffer* buffer, const FloatRect& srcRect, const FloatRect& destRect)
+void GraphicsContext::drawImage(ImageBuffer* buffer, const FloatRect& srcRect, const FloatRect& dstRect)
 {
     QPainter* painter = static_cast<QPainter*>(platformContext());
     QPixmap px = *buffer->pixmap();