Changeset 106167 in webkit

Timestamp:

Jan 27, 2012 4:05:51 PM (12 years ago)

Author:

msaboff@apple.com

Message:

StringProtoFuncToUpperCase should call StringImpl::upper similar to StringProtoToLowerCase
​https://bugs.webkit.org/show_bug.cgi?id=76647

Reviewed by Geoffrey Garen.

Changed stringProtoFuncToUpperCase to call StringImpl::upper() is a manor similar
to stringProtoFuncToLowerCase(). Fixed StringImpl::upper() to handle the two
8 bit characters that when converted to upper case become 16 bit characters.

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncToLowerCase): Removed extra trailing whitespace.
(JSC::stringProtoFuncToUpperCase):

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::upper):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/StringPrototype.cpp (modified) (2 diffs)
• wtf/text/StringImpl.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-27  Michael Saboff  <msaboff@apple.com>
+
+        StringProtoFuncToUpperCase should call StringImpl::upper similar to StringProtoToLowerCase
+        https://bugs.webkit.org/show_bug.cgi?id=76647
+
+        Reviewed by Geoffrey Garen.
+
+        Changed stringProtoFuncToUpperCase to call StringImpl::upper() is a manor similar
+        to stringProtoFuncToLowerCase().  Fixed StringImpl::upper() to handle the two
+        8 bit characters that when converted to upper case become 16 bit characters.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncToLowerCase): Removed extra trailing whitespace.
+        (JSC::stringProtoFuncToUpperCase):
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::upper):
+
 2012-01-27  Hajime Morita  <morrita@google.com>
 

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -1181 +1181 @@
         return JSValue::encode(sVal);
 
-    StringImpl* ourImpl = s.impl();   
+    StringImpl* ourImpl = s.impl();
     RefPtr<StringImpl> lower = ourImpl->lower();
     if (ourImpl == lower.get())
@@ -1200 +1200 @@
         return JSValue::encode(sVal);
 
-    const UChar* sData = s.characters();
-    Vector<UChar> buffer(sSize);
-
-    UChar ored = 0;
-    for (int i = 0; i < sSize; i++) {
-        UChar c = sData[i];
-        ored |= c;
-        buffer[i] = toASCIIUpper(c);
-    }
-    if (!(ored & ~0x7f))
-        return JSValue::encode(jsString(exec, UString::adopt(buffer)));
-
-    bool error;
-    int length = Unicode::toUpper(buffer.data(), sSize, sData, sSize, &error);
-    if (error) {
-        buffer.resize(length);
-        length = Unicode::toUpper(buffer.data(), length, sData, sSize, &error);
-        if (error)
-            return JSValue::encode(sVal);
-    }
-    if (length == sSize) {
-        if (memcmp(buffer.data(), sData, length * sizeof(UChar)) == 0)
-            return JSValue::encode(sVal);
-    } else
-        buffer.resize(length);
-    return JSValue::encode(jsString(exec, UString::adopt(buffer)));
+    StringImpl* ourImpl = s.impl();
+    RefPtr<StringImpl> upper = ourImpl->upper();
+    if (ourImpl == upper.get())
+        return JSValue::encode(sVal);
+    return JSValue::encode(jsString(exec, UString(upper.release())));
 }
 

trunk/Source/JavaScriptCore/wtf/text/StringImpl.cpp

@@ -364 +364 @@
     int32_t length = m_length;
 
+    const UChar* source16;
+
     if (is8Bit()) {
         LChar* data8;
@@ -379 +381 @@
 
         // Do a slower implementation for cases that include non-ASCII Latin-1 characters.
-        for (int32_t i = 0; i < length; i++)
-            data8[i] = static_cast<LChar>(Unicode::toUpper(m_data8[i]));
+        for (int32_t i = 0; i < length; i++) {
+            UChar upper = Unicode::toUpper(m_data8[i]);
+            if (UNLIKELY(upper > 0xff)) {
+                // Have a character that is 16bit when converted to uppercase.
+                source16 = characters();
+                goto upconvert;
+            }
+                
+            data8[i] = static_cast<LChar>(upper);
+        }
 
         return newImpl.release();
     }
 
+    source16 = m_data16;
+
+upconvert:
     UChar* data16;
     RefPtr<StringImpl> newImpl = createUninitialized(m_length, data16);
@@ -391 +404 @@
     UChar ored = 0;
     for (int i = 0; i < length; i++) {
-        UChar c = m_data16[i];
+        UChar c = source16[i];
         ored |= c;
         data16[i] = toASCIIUpper(c);
@@ -401 +414 @@
     bool error;
     newImpl = createUninitialized(m_length, data16);
-    int32_t realLength = Unicode::toUpper(data16, length, m_data16, m_length, &error);
+    int32_t realLength = Unicode::toUpper(data16, length, source16, m_length, &error);
     if (!error && realLength == length)
         return newImpl;
     newImpl = createUninitialized(realLength, data16);
-    Unicode::toUpper(data16, realLength, m_data16, m_length, &error);
+    Unicode::toUpper(data16, realLength, source16, m_length, &error);
     if (error)
         return this;