Changeset 34132 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

May 26, 2008, 5:29:11 AM (17 years ago)

Author:

Simon Hausmann

Message:

JavaScriptCore:

2008-05-23 Tor Arne Vestbø <​[email protected]>

Reviewed by Simon.

Fixed toLower and toUpper implementations to allow being called
with a null result pointer and resultLength, to determine the
number of characters needed for the case conversion.

LayoutTests:

008-05-23 Tor Arne Vestbø <​[email protected]>

Reviewed by Simon.

Added a comment to the skipping of fast/css/case-transform.html that
mentions the reason of failure being a Qt bug.

File:

• trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h (modified) (6 diffs)

trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

@@ -189 +189 @@
         const UChar *s = src;
         UChar *r = result;
-        UChar *re = result + resultLength;
+        uint rindex = 0;
 
         // this avoids one out of bounds check in the loop
-        if (QChar(*s).isLowSurrogate())
-            *r++ = *s++;
+        if (s < e && QChar(*s).isLowSurrogate()) {
+            if (r)
+                r[rindex] = *s++;
+            ++rindex;
+        }
 
         int needed = 0;
-        while (s < e && r < re) {
+        while (s < e && (rindex < resultLength || !r)) {
             uint c = *s;
             if (QChar(c).isLowSurrogate() && QChar(*(s - 1)).isHighSurrogate())
@@ -211 +214 @@
                 qstring = qstring.toLower();
                 for (int i = 0; i < qstring.length(); ++i) {
-                    if (r == re) {
+                    if (rindex >= resultLength) {
                         needed += qstring.length() - i;
                         break;
                     }
-                    *r = qstring.at(i).unicode();
-                    ++r;
+                    if (r)
+                        r[rindex] = qstring.at(i).unicode();
+                    ++rindex;
                 }
             } else {
-                *r = *s + prop->lowerCaseDiff;
-                ++r;
+                if (r)
+                    r[rindex] = *s + prop->lowerCaseDiff;
+                ++rindex;
             }
             ++s;
@@ -227 +232 @@
             needed += e - s;
         *error = (needed != 0);
-        if (r < re)
-            *r = 0;
-        return (r - result) + needed;
+        if (rindex < resultLength)
+            r[rindex] = 0;
+        return rindex + needed;
     }
 
@@ -242 +247 @@
         const UChar *s = src;
         UChar *r = result;
-        UChar *re = result + resultLength;
+        int rindex = 0;
 
         // this avoids one out of bounds check in the loop
-        if (QChar(*s).isLowSurrogate())
-            *r++ = *s++;
+        if (s < e && QChar(*s).isLowSurrogate()) {
+            if (r)
+                r[rindex] = *s++;
+            ++rindex;
+        }
 
         int needed = 0;
-        while (s < e && r < re) {
+        while (s < e && (rindex < resultLength || !r)) {
             uint c = *s;
             if (QChar(c).isLowSurrogate() && QChar(*(s - 1)).isHighSurrogate())
@@ -264 +272 @@
                 qstring = qstring.toUpper();
                 for (int i = 0; i < qstring.length(); ++i) {
-                    if (r == re) {
+                    if (rindex >= resultLength) {
                         needed += qstring.length() - i;
                         break;
                     }
-                    *r = qstring.at(i).unicode();
-                    ++r;
+                    if (r)
+                        r[rindex] = qstring.at(i).unicode();
+                    ++rindex;
                 }
             } else {
-                *r = *s + prop->upperCaseDiff;
-                ++r;
+                if (r)
+                    r[rindex] = *s + prop->upperCaseDiff;
+                ++rindex;
             }
             ++s;
@@ -280 +290 @@
             needed += e - s;
         *error = (needed != 0);
-        if (r < re)
-            *r = 0;
-        return (r - result) + needed;
+        if (rindex < resultLength)
+            r[rindex] = 0;
+        return rindex + needed;
     }