From b6f5964533751008b4aae62c5559347921de1dbb Mon Sep 17 00:00:00 2001 From: "oliver@apple.com" Date: Sat, 16 Feb 2008 06:44:46 +0000 Subject: [PATCH] Build fix for Qt and Cairo builds git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30337 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 10 ++++++++++ .../platform/graphics/cairo/GraphicsContextCairo.cpp | 6 +++--- WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index f85ae22c2c72..7fcb3a66ea46 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2008-02-15 Oliver Hunt + + 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 Reviewed by Dan B. diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp index 9baf7801c032..1c1ea16913c9 100644 --- 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 6f97a9771c0a..ec35d962a20e 100644 --- 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(platformContext()); QPixmap px = *buffer->pixmap(); -- 2.36.0