Changeset 127809 in webkit for trunk/Source/JavaScriptCore/runtime

Timestamp:

Sep 6, 2012, 6:29:12 PM (13 years ago)

Author:

[email protected]

Message:

16 bit JSRopeString up converts an 8 bit fibers to 16 bits during resolution
​https://bugs.webkit.org/show_bug.cgi?id=95810

Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

Added 8 bit path that copies the contents of an 8 bit fiber to the 16 bit buffer
when resolving a 16 bit rope.

• runtime/JSString.cpp:

(JSC::JSRopeString::resolveRopeSlowCase):

Source/WTF:

New copy routine that takes an 8 bit source and a 16 bit destination. Used when copying
the contents of an 8 bit fiber to the 16 bit buffer when resolving a 16 bit rope.

• wtf/text/StringImpl.h:

(WTF::StringImpl::copyChars):
(StringImpl):

File:

• trunk/Source/JavaScriptCore/runtime/JSString.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -131 +131 @@
         StringImpl* string = m_fibers[i]->m_value.impl();
         unsigned length = string->length();
-        StringImpl::copyChars(position, string->characters(), length);
+        if (string->is8Bit())
+            StringImpl::copyChars(position, string->characters8(), length);
+        else
+            StringImpl::copyChars(position, string->characters16(), length);
         position += length;
         m_fibers[i].clear();
@@ -203 +206 @@
         unsigned length = string->length();
         position -= length;
-        StringImpl::copyChars(position, string->characters(), length);
+        if (string->is8Bit())
+            StringImpl::copyChars(position, string->characters8(), length);
+        else
+            StringImpl::copyChars(position, string->characters16(), length);
     }