diff options
| author | Derek Sollenberger <derek@android.com> | 2012-01-31 14:04:06 -0500 |
|---|---|---|
| committer | Derek Sollenberger <derek@android.com> | 2012-01-31 14:07:30 -0500 |
| commit | 2857538e8cd8c752b06ee75dd039791a186455b3 (patch) | |
| tree | 8cb2c1d6380b090cdbe9e17408323f64931ada26 /Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp | |
| parent | 0ab06914e1fb967121601f35b3e25065723d6d35 (diff) | |
| download | external_webkit-2857538e8cd8c752b06ee75dd039791a186455b3.zip external_webkit-2857538e8cd8c752b06ee75dd039791a186455b3.tar.gz external_webkit-2857538e8cd8c752b06ee75dd039791a186455b3.tar.bz2 | |
Skia API changes as a result of an update to the Skia library.
These changes are required to work with r3022 of Skia
Change-Id: I4d4a13bad9acc54934bbb46bdfc08ee424c7a33a
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 691fbca..751a08f 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. |