From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Feb 2012 09:55:33 +0100 Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560) --- Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp') diff --git a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp index 547b68d73..1f0e13c71 100644 --- a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp +++ b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp @@ -28,6 +28,7 @@ #include "DataReference.h" #include "WebCoreArgumentCoders.h" +#include namespace WebKit { @@ -83,7 +84,24 @@ void EncoderAdapter::encodeDouble(double value) void EncoderAdapter::encodeString(const String& value) { - m_encoder->encode(value); + // This mimics the CoreIPC binary encoding of Strings prior to r88886. + // Whenever the CoreIPC binary encoding changes, we'll have to "undo" the changes here. + // FIXME: We shouldn't use the CoreIPC binary encoding format for history, + // and we should come up with a migration strategy so we can actually bump the version number + // without breaking encoding/decoding of the history tree. + + // Special case the null string. + if (value.isNull()) { + m_encoder->encodeUInt32(std::numeric_limits::max()); + return; + } + + uint32_t length = value.length(); + m_encoder->encode(length); + + uint64_t lengthInBytes = length * sizeof(UChar); + m_encoder->encode(lengthInBytes); + m_encoder->encodeFixedLengthData(reinterpret_cast(value.characters()), length * sizeof(UChar), __alignof(UChar)); } } -- cgit v1.2.1