[v8] prepare SerializedScriptValue for transition to Latin-1

Dan Carney · webkit-commit-queue · commit 202025b65fdf · 2013-01-26T16:08:41.000Z
https://bugs.webkit.org/show_bug.cgi?id=107655 Patch by Dan Carney <dcarney@google.com> on 2013-01-26 Reviewed by Kentaro Hara. No new tests. Covered by existing tests. * bindings/v8/SerializedScriptValue.cpp: Canonical link: https://commits.webkit.org/126220@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@140911 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-26  Dan Carney  <dcarney@google.com>
+
+        [v8] prepare SerializedScriptValue for transition to Latin-1
+        https://bugs.webkit.org/show_bug.cgi?id=107655
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. Covered by existing tests.
+
+        * bindings/v8/SerializedScriptValue.cpp:
+
 2013-01-26  Justin Schuh  <jschuh@chromium.org>
 
         [CHROMIUM] Suppress more c4267 build warnings for Win64 targets
diff --git a/Source/WebCore/bindings/v8/SerializedScriptValue.cpp b/Source/WebCore/bindings/v8/SerializedScriptValue.cpp
@@ -315,15 +315,22 @@ class Writer {
 
     void writeOneByteString(v8::Handle<v8::String>& string)
     {
-        int length = string->Length();
-        ASSERT(length >= 0);
+        int stringLength = string->Length();
+        int utf8Length = string->Utf8Length();
+        ASSERT(stringLength >= 0 && utf8Length >= 0);
 
         append(StringTag);
-        doWriteUint32(static_cast<uint32_t>(length));
-        ensureSpace(length);
-
-        string->WriteOneByte(byteAt(m_position), 0, length, v8StringWriteOptions());
-        m_position += length;
+        doWriteUint32(static_cast<uint32_t>(utf8Length));
+        ensureSpace(utf8Length);
+
+        // ASCII fast path.
+        if (stringLength == utf8Length)
+            string->WriteOneByte(byteAt(m_position), 0, utf8Length, v8StringWriteOptions());
+        else {
+            char* buffer = reinterpret_cast<char*>(byteAt(m_position));
+            string->WriteUtf8(buffer, utf8Length, 0, v8StringWriteOptions());
+        }
+        m_position += utf8Length;
     }
 
     void writeUCharString(v8::Handle<v8::String>& string)
