summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-06-16 12:04:03 +0100
committerBen Murdoch <benm@google.com>2010-06-18 11:04:36 +0100
commite58ca4831cefed03d5dc140d644c6bf6e08d83e0 (patch)
tree9eb1e27145e3058a295255618aec9df3a4d864be /WebCore/platform/graphics/android/ImageBufferAndroid.cpp
parentb2cd2d2fdadc82aa07bc39af12040a593c8f4098 (diff)
downloadexternal_webkit-e58ca4831cefed03d5dc140d644c6bf6e08d83e0.zip
external_webkit-e58ca4831cefed03d5dc140d644c6bf6e08d83e0.tar.gz
external_webkit-e58ca4831cefed03d5dc140d644c6bf6e08d83e0.tar.bz2
Merge webkit.org at r61121: Update ImageBuffer::toDataURL() parameters in our port. See http://trac.webkit.org/changeset/60675
Change-Id: I42bd49b720616625daab67c5ec8c54935e921ae3
Diffstat (limited to 'WebCore/platform/graphics/android/ImageBufferAndroid.cpp')
-rw-r--r--WebCore/platform/graphics/android/ImageBufferAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index 301cff5..60e2c1c 100644
--- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -209,7 +209,7 @@ void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sou
}
-String ImageBuffer::toDataURL(const String&, double) const
+String ImageBuffer::toDataURL(const String&, const double*) const
{
// Encode the image into a vector.
SkDynamicMemoryWStream pngStream;