diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp')
| -rw-r--r-- | WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp b/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp index c5de485..d1b06f3 100644 --- a/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp +++ b/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp @@ -33,6 +33,7 @@ #include "MIMETypeRegistry.h" #include "StillImageHaiku.h" #include <wtf/text/CString.h> +#include <wtf/text/StringConcatenate.h> #include <BitmapStream.h> #include <String.h> #include <TranslatorRoster.h> @@ -367,8 +368,7 @@ String ImageBuffer::toDataURL(const String& mimeType, const double*) const base64Encode(reinterpret_cast<const char*>(translatedStream.Buffer()), translatedStream.BufferLength(), encodedBuffer); - return String::format("data:%s;base64,%s", mimeType.utf8().data(), - encodedBuffer.data()); + return makeString("data:", mimeType, ";base64,", encodedBuffer.data()); } } // namespace WebCore |