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

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 3e13e33..641c0f9 100644 (file)
--- 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 60e2c1c..082af3e 100644 (file)
--- 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<int>& lookupTable)
+{
+    notImplemented();
+}
+
 }