summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-17 13:10:43 +0100
committerBen Murdoch <benm@google.com>2009-08-17 13:10:43 +0100
commit739fb10578c1a5d72777bb82cc2ca2ada2ace963 (patch)
tree65dd5bb1d2f8dc9466222f655aab9da6cd86304b /WebCore/platform/graphics/android
parente9ad5c47c4280945f60b4525ce59316dbe6501cc (diff)
downloadexternal_webkit-739fb10578c1a5d72777bb82cc2ca2ada2ace963.zip
external_webkit-739fb10578c1a5d72777bb82cc2ca2ada2ace963.tar.gz
external_webkit-739fb10578c1a5d72777bb82cc2ca2ada2ace963.tar.bz2
More build fixes.
Diffstat (limited to 'WebCore/platform/graphics/android')
-rw-r--r--WebCore/platform/graphics/android/ImageBufferAndroid.cpp2
-rw-r--r--WebCore/platform/graphics/android/ImageSourceAndroid.cpp2
-rw-r--r--WebCore/platform/graphics/android/PathAndroid.cpp3
3 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index 7b3e8e8..89d841d 100644
--- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -46,7 +46,7 @@ ImageBufferData::ImageBufferData(const IntSize&)
{
}
-ImageBuffer::ImageBuffer(const IntSize& size, bool grayScale, bool& success)
+ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace colorSpace, bool& success)
: m_data(size)
, m_size(size)
{
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
index 70730d8..d33f94f 100644
--- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
@@ -39,7 +39,7 @@
#ifdef ANDROID_ANIMATED_GIF
#include "EmojiFont.h"
- #include "skia/GIFImageDecoder.h"
+ #include "gif/GIFImageDecoder.h"
using namespace android;
#endif
diff --git a/WebCore/platform/graphics/android/PathAndroid.cpp b/WebCore/platform/graphics/android/PathAndroid.cpp
index e7c61d1..0eb1414 100644
--- a/WebCore/platform/graphics/android/PathAndroid.cpp
+++ b/WebCore/platform/graphics/android/PathAndroid.cpp
@@ -342,8 +342,9 @@ static FloatRect boundingBoxForCurrentStroke(GraphicsContext* context)
static GraphicsContext* scratchContext()
{
static ImageBuffer* scratch = 0;
+ // TODO(benm): Confirm with reed that it's correct to use the (default) DeviceRGB ColorSpace parameter in the call to create below.
if (!scratch)
- scratch = ImageBuffer::create(IntSize(1, 1), false).release();
+ scratch = ImageBuffer::create(IntSize(1, 1)).release();
// We don't bother checking for failure creating the ImageBuffer, since our
// ImageBuffer initializer won't fail.
return scratch->context();