summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-20 16:53:45 +0100
committerBen Murdoch <benm@google.com>2011-05-23 18:54:14 +0100
commite4427b844b712104108d886d50294f7d3a052a32 (patch)
tree3798248dbc8cd260e84a29118f05207e67d84211
parent6fbaea61d241814b015fd7e022796e68d8ef3e8e (diff)
downloadexternal_webkit-e4427b844b712104108d886d50294f7d3a052a32.zip
external_webkit-e4427b844b712104108d886d50294f7d3a052a32.tar.gz
external_webkit-e4427b844b712104108d886d50294f7d3a052a32.tar.bz2
Merge WebKit at r76408: Fix ImageBufferAndroid.
Implement missing dataSize function introduced in http://trac.webkit.org/changeset/76371 (JSC only) Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
-rw-r--r--Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index 3ac0cba..0a36051 100644
--- a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -248,4 +248,9 @@ void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookupTable)
notImplemented();
}
+size_t ImageBuffer::dataSize() const
+{
+ return m_size.width() * m_size.height() * 4;
+}
+
}