diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 16:02:07 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:38:49 +0100 |
| commit | b73606ba44efcb32effeb03603d2eaa402455062 (patch) | |
| tree | 3810b7fbed3c2508f97efb8f962422f28aeee995 /WebCore | |
| parent | 41c8cd06bd25769654e321d1222856182ebad067 (diff) | |
| download | external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.zip external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.tar.gz external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.tar.bz2 | |
Merge Webkit at r70209: ImageColorSpace type no longer exists.
It has been replaced with ColorSpace. Also DeviceColorSpace
has been renamed ColorSpaceDeviceRGB.
See http://trac.webkit.org/changeset/70143
Change-Id: Ib603dcef04dcfa51fca142d8b3d03689a18e110f
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp index 3b89777..2f9e543 100644 --- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp @@ -28,6 +28,7 @@ #include "Base64.h" #include "BitmapImage.h" +#include "ColorSpace.h" #include "ImageData.h" #include "GraphicsContext.h" #include "NotImplemented.h" @@ -49,7 +50,7 @@ ImageBufferData::ImageBufferData(const IntSize&) { } -ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace colorSpace, bool& success) +ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool& success) : m_data(size) , m_size(size) { |