[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a6d17594cf59e08d5581bdcd3315427e6a81d0d0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 17:53:04 2010 +0000

    2010-08-27  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Nikolas Zimmermann.
    
            [WINCE] Buildfix for graphics code after r65449
            https://bugs.webkit.org/show_bug.cgi?id=44510
    
            * platform/graphics/wince/GraphicsContextWince.cpp:
            * platform/graphics/wince/ImageBufferWince.cpp:
            (WebCore::ImageBuffer::drawsUsingCopy):
            (WebCore::ImageBuffer::copyImage):
            (WebCore::ImageBuffer::clip):
            (WebCore::ImageBuffer::draw):
            (WebCore::ImageBuffer::drawPattern):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 233a4d2..a5d314d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-27  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        [WINCE] Buildfix for graphics code after r65449
+        https://bugs.webkit.org/show_bug.cgi?id=44510
+
+        * platform/graphics/wince/GraphicsContextWince.cpp:
+        * platform/graphics/wince/ImageBufferWince.cpp:
+        (WebCore::ImageBuffer::drawsUsingCopy):
+        (WebCore::ImageBuffer::copyImage):
+        (WebCore::ImageBuffer::clip):
+        (WebCore::ImageBuffer::draw):
+        (WebCore::ImageBuffer::drawPattern):
+
 2010-08-27  Dawit Alemayehu  <adawit at kde.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/graphics/wince/GraphicsContextWince.cpp b/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
index 162512a..b1f48a4 100644
--- a/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
+++ b/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
@@ -1548,11 +1548,6 @@ AffineTransform GraphicsContext::getCTM() const
     return m_data->m_transform;
 }
 
-void GraphicsContext::clipToImageBuffer(const FloatRect&, const ImageBuffer*)
-{
-    notImplemented();
-}
-
 void GraphicsContext::fillRect(const FloatRect& rect)
 {
     savePlatformState();
diff --git a/WebCore/platform/graphics/wince/ImageBufferWince.cpp b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
index 1a25f4f..10e502d 100644
--- a/WebCore/platform/graphics/wince/ImageBufferWince.cpp
+++ b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
@@ -95,12 +95,33 @@ GraphicsContext* ImageBuffer::context() const
     return m_context.get();
 }
 
-Image* ImageBuffer::image() const
+bool ImageBuffer::drawsUsingCopy() const
 {
-    if (!m_image)
-        m_image = adoptRef(new BufferedImage(&m_data));
+    return true;
+}
+
+PassRefPtr<Image> ImageBuffer::copyImage() const
+{
+    return adoptRef(new BufferedImage(&m_data));
+}
+
+void ImageBuffer::clip(GraphicsContext*, const FloatRect&) const
+{
+    notImplemented();
+}
+
+void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect,
+                       CompositeOperator op , bool useLowQualityScale)
+{
+    RefPtr<Image> imageCopy = copyImage();
+    context->drawImage(imageCopy.get(), styleColorSpace, destRect, srcRect, op, useLowQualityScale);
+}
 
-    return m_image.get();
+void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
+                              const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
+{
+    RefPtr<Image> imageCopy = copyImage();
+    imageCopy->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
 }
 
 template <bool premultiplied> PassRefPtr<ImageData>

-- 
WebKit Debian packaging