[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 b5296f2a67af86800370c8321d9a34813328f375
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 03:48:44 2010 +0000

    2010-07-25  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kent Tamura.
    
            [WINCE] Buildfix for ImageBufferWince
            https://bugs.webkit.org/show_bug.cgi?id=42928
    
            * platform/graphics/wince/ImageBufferWince.cpp:
            (WebCore::):
            (WebCore::BufferedImage::draw): Pass through ColorSpace parameter.
            (WebCore::BufferedImage::drawPattern): Ditto.
            (WebCore::ImageBuffer::platformTransformColorSpace): Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64026 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 60ba526..e2b5fab 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kent Tamura.
 
+        [WINCE] Buildfix for ImageBufferWince
+        https://bugs.webkit.org/show_bug.cgi?id=42928
+
+        * platform/graphics/wince/ImageBufferWince.cpp:
+        (WebCore::):
+        (WebCore::BufferedImage::draw): Pass through ColorSpace parameter.
+        (WebCore::BufferedImage::drawPattern): Ditto.
+        (WebCore::ImageBuffer::platformTransformColorSpace): Added.
+
+2010-07-25  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kent Tamura.
+
         [WINCE] Buildfix for PopupMenuWin.cpp
         https://bugs.webkit.org/show_bug.cgi?id=42932
 
diff --git a/WebCore/platform/graphics/wince/ImageBufferWince.cpp b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
index 4b739c8..1a25f4f 100644
--- a/WebCore/platform/graphics/wince/ImageBufferWince.cpp
+++ b/WebCore/platform/graphics/wince/ImageBufferWince.cpp
@@ -26,8 +26,10 @@
 #include "Image.h"
 #include "ImageData.h"
 #include "JPEGEncoder.h"
+#include "NotImplemented.h"
 #include "PNGEncoder.h"
 #include "SharedBitmap.h"
+#include "UnusedParam.h"
 #include <wtf/UnusedParam.h>
 
 namespace WebCore {
@@ -43,24 +45,24 @@ public:
     virtual IntSize size() const { return IntSize(m_data->m_bitmap->width(), m_data->m_bitmap->height()); }
     virtual void destroyDecodedData(bool destroyAll = true) {}
     virtual unsigned decodedSize() const { return 0; }
-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator);
+    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);
     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
-                             const FloatPoint& phase, CompositeOperator, const FloatRect& destRect);
+                             const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
 
     const ImageBufferData* m_data;
 };
 
-void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp)
+void BufferedImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp)
 {
     IntRect intDstRect = enclosingIntRect(dstRect);
     IntRect intSrcRect(srcRect);
-    m_data->m_bitmap->draw(ctxt, intDstRect, intSrcRect, compositeOp);
+    m_data->m_bitmap->draw(ctxt, intDstRect, intSrcRect, styleColorSpace, compositeOp);
 }
 
 void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
-                             const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect)
+                             const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
 {
-    m_data->m_bitmap->drawPattern(ctxt, tileRectIn, patternTransform, phase, op, destRect, size());
+    m_data->m_bitmap->drawPattern(ctxt, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, size());
 }
 
 ImageBufferData::ImageBufferData(const IntSize& size)
@@ -216,6 +218,12 @@ void ImageBuffer::putPremultipliedImageData(ImageData* source, const IntRect& so
     putImageData<true>(source, sourceRect, destPoint, m_data.m_bitmap.get());
 }
 
+void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
+{
+    UNUSED_PARAM(lookUpTable);
+    notImplemented();
+}
+
 String ImageBuffer::toDataURL(const String& mimeType, const double*) const
 {
     if (!m_data.m_bitmap->bytes())

-- 
WebKit Debian packaging