diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:41:59 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:41:59 -0500 |
| commit | faf2b5dab67cbe9c5a9244f3912e916d0184f765 (patch) | |
| tree | 752c1c74fbbc2686cdb540cb8cbe0176e3da37bf /Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp | |
| parent | 97fafc16fc2fa715dd78f611c0ebe33a64e53f88 (diff) | |
| parent | 6f1bf086c7d24634eb00a62d5af024bda7b06365 (diff) | |
| download | external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.zip external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.tar.gz external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.tar.bz2 | |
resolved conflicts for merge of 6f1bf086 to master
Change-Id: I104f02e5e6ec50c002a2bdc960b428ece13528dd
Diffstat (limited to 'Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp index 439733b..f148881 100644 --- a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp @@ -36,6 +36,7 @@ #include "SkBitmapRef.h" #include "SkCanvas.h" #include "SkColorPriv.h" +#include "SkData.h" #include "SkDevice.h" #include "SkImageEncoder.h" #include "SkStream.h" @@ -241,7 +242,9 @@ String ImageBuffer::toDataURL(const String&, const double*) const // Convert it into base64. Vector<char> pngEncodedData; - pngEncodedData.append(pngStream.getStream(), pngStream.getOffset()); + SkData* streamData = pngStream.copyToData(); + pngEncodedData.append((char*)streamData->data(), streamData->size()); + streamData->unref(); Vector<char> base64EncodedData; base64Encode(pngEncodedData, base64EncodedData); // Append with a \0 so that it's a valid string. |