Changeset 140409 in webkit

Timestamp:

Jan 22, 2013, 3:59:19 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[v8] Convert string conversion calls to one byte versions
​https://bugs.webkit.org/show_bug.cgi?id=107524

Patch by Dan Carney <​dcarney@google.com> on 2013-01-22
Reviewed by Kentaro Hara.

No new tests. No change in functionality.

• bindings/v8/SerializedScriptValue.cpp:
• bindings/v8/V8StringResource.cpp:

(WebCore::WebCoreStringResourceBase::toWebCoreStringResourceBase):
(StringTraits):
(WebCore::true):
(WebCore::v8StringToWebCoreString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/SerializedScriptValue.cpp (modified) (4 diffs)
• bindings/v8/V8StringResource.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Dan Carney  <dcarney@google.com>
+
+        [v8] Convert string conversion calls to one byte versions
+        https://bugs.webkit.org/show_bug.cgi?id=107524
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. No change in functionality.
+
+        * bindings/v8/SerializedScriptValue.cpp:
+        * bindings/v8/V8StringResource.cpp:
+        (WebCore::WebCoreStringResourceBase::toWebCoreStringResourceBase):
+        (StringTraits):
+        (WebCore::true):
+        (WebCore::v8StringToWebCoreString):
+
 2013-01-22  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.cpp

@@ -314 +314 @@
     }
 
-    void writeAsciiString(v8::Handle<v8::String>& string)
+    void writeOneByteString(v8::Handle<v8::String>& string)
     {
         int length = string->Length();
@@ -323 +323 @@
         ensureSpace(length);
 
-        char* buffer = reinterpret_cast<char*>(byteAt(m_position));
-        string->WriteAscii(buffer, 0, length, v8StringWriteOptions());
+        string->WriteOneByte(byteAt(m_position), 0, length, v8StringWriteOptions());
         m_position += length;
     }
@@ -667 +666 @@
     int v8StringWriteOptions()
     {
-        return v8::String::NO_NULL_TERMINATION | v8::String::PRESERVE_ASCII_NULL;
+        return v8::String::NO_NULL_TERMINATION;
     }
 
@@ -1049 +1048 @@
     {
         v8::Handle<v8::String> string = value.As<v8::String>();
-        if (!string->Length() || !string->MayContainNonAscii())
-            m_writer.writeAsciiString(string);
+        if (!string->Length() || string->IsOneByte())
+            m_writer.writeOneByteString(string);
         else
             m_writer.writeUCharString(string);

trunk/Source/WebCore/bindings/v8/V8StringResource.cpp

@@ -38 +38 @@
     if (!resource)
         return 0;
-    if (encoding == v8::String::ASCII_ENCODING)
+    if (encoding == v8::String::ONE_BYTE_ENCODING)
         return static_cast<WebCoreStringResource8*>(resource);
     return static_cast<WebCoreStringResource16*>(resource);
@@ -53 +53 @@
     static const StringClass& fromStringResource(WebCoreStringResourceBase*);
     static bool is16BitAtomicString(StringClass&);
-    template<bool ascii>
+    template<bool oneByte>
     static StringClass fromV8String(v8::Handle<v8::String>, int);
 };
@@ -67 +67 @@
         return false;
     }
-    template<bool ascii>
+    template<bool oneByte>
     static String fromV8String(v8::Handle<v8::String>, int);
 };
@@ -81 +81 @@
         return !string.string().is8Bit();
     }
-    template<bool ascii>
+    template<bool oneByte>
     static AtomicString fromV8String(v8::Handle<v8::String>, int);
 };
@@ -117 +117 @@
     LChar* buffer;
     String result = String::createUninitialized(length, buffer);
-    v8String->WriteAscii(reinterpret_cast<char*>(buffer), 0, length, v8::String::PRESERVE_ASCII_NULL);
+    v8String->WriteOneByte(buffer, 0, length);
     return result;
 }
@@ -128 +128 @@
     if (length <= inlineBufferSize) {
         LChar inlineBuffer[inlineBufferSize];
-        v8String->WriteAscii(reinterpret_cast<char*>(inlineBuffer), 0, length, v8::String::PRESERVE_ASCII_NULL);
+        v8String->WriteOneByte(inlineBuffer, 0, length);
         return AtomicString(inlineBuffer, length);
     }
     LChar* buffer;
     String string = String::createUninitialized(length, buffer);
-    v8String->WriteAscii(reinterpret_cast<char*>(buffer), 0, length, v8::String::PRESERVE_ASCII_NULL);
+    v8String->WriteOneByte(buffer, 0, length);
     return AtomicString(string);
 }
@@ -147 +147 @@
         if (LIKELY(!!resource)) {
             WebCoreStringResourceBase* base;
-            if (encoding == v8::String::ASCII_ENCODING)
+            if (encoding == v8::String::ONE_BYTE_ENCODING)
                 base = static_cast<WebCoreStringResource8*>(resource);
             else
@@ -159 +159 @@
         return String("");
 
-    bool nonAscii = v8String->MayContainNonAscii();
-    StringType result(nonAscii ? StringTraits<StringType>::template fromV8String<false>(v8String, length) : StringTraits<StringType>::template fromV8String<true>(v8String, length));
+    bool oneByte = v8String->IsOneByte();
+    StringType result(oneByte ? StringTraits<StringType>::template fromV8String<true>(v8String, length) : StringTraits<StringType>::template fromV8String<false>(v8String, length));
 
     if (external != Externalize || !v8String->CanMakeExternal())
         return result;
 
-    if (!nonAscii && !StringTraits<StringType>::is16BitAtomicString(result)) {
+    if (oneByte && !StringTraits<StringType>::is16BitAtomicString(result)) {
         WebCoreStringResource8* stringResource = new WebCoreStringResource8(result);
         if (UNLIKELY(!v8String->MakeExternal(stringResource)))