From 71e31ef15beacd95ec56d79e58d031732847772a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 22 Jul 2010 18:22:43 +0100 Subject: [PATCH] Merge Webkit at r63859 : SVG code now required ImageBuffer::transformColorSpace, so add it and stub out platformTransformColorSpace. See http://trac.webkit.org/changeset/63450 Change-Id: I2c84c13a19b1a787b0edbfb9fcefd08acd9ed6ff --- WebCore/Android.mk | 1 + WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 3e13e339e..641c0f938 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -497,6 +497,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/GraphicsLayer.cpp \ platform/graphics/GraphicsTypes.cpp \ platform/graphics/Image.cpp \ + platform/graphics/ImageBuffer.cpp \ platform/graphics/IntRect.cpp \ platform/graphics/MediaPlayer.cpp \ platform/graphics/Path.cpp \ diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp index 60e2c1c12..082af3ed1 100644 --- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp @@ -29,8 +29,8 @@ #include "Base64.h" #include "BitmapImage.h" #include "ImageData.h" -#include "android_graphics.h" #include "GraphicsContext.h" +#include "NotImplemented.h" #include "PlatformGraphicsContext.h" #include "SkBitmapRef.h" #include "SkCanvas.h" @@ -39,6 +39,7 @@ #include "SkImageEncoder.h" #include "SkStream.h" #include "SkUnPreMultiply.h" +#include "android_graphics.h" using namespace std; @@ -228,4 +229,9 @@ String ImageBuffer::toDataURL(const String&, const double*) const return String::format("data:image/png;base64,%s", base64EncodedData.data()); } +void ImageBuffer::platformTransformColorSpace(const Vector& lookupTable) +{ + notImplemented(); +} + } -- 2.11.0