diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 18:22:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:28 +0100 |
| commit | 71e31ef15beacd95ec56d79e58d031732847772a (patch) | |
| tree | 3064fb586601d3e3f1197dcd16096ac379e956c4 /WebCore | |
| parent | 35ca3132cd63d76ed45f6549a969cbe99e24e260 (diff) | |
| download | external_webkit-71e31ef15beacd95ec56d79e58d031732847772a.zip external_webkit-71e31ef15beacd95ec56d79e58d031732847772a.tar.gz external_webkit-71e31ef15beacd95ec56d79e58d031732847772a.tar.bz2 | |
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
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.mk | 1 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 3e13e33..641c0f9 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 60e2c1c..082af3e 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<int>& lookupTable) +{ + notImplemented(); +} + } |