Changeset 27746 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Nov 12, 2007, 11:12:55 PM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=15953
Add UTF-8 encoding/decoding to WTF

• kjs/ustring.h: Moved UTF8SequenceLength() and decodeUTF8Sequence() to wtf/unicode.
• kjs/ustring.cpp: (KJS::UString::UTF8String): Changed this function to take a strict/lenient parameter. Callers are not interested in getting decoding results in strict mode, so this allows for bailing out as soon as an error is seen.

• kjs/function.cpp: (KJS::encode): Updated for new UString::UTF8String() signature.

• API/JSStringRef.cpp: (JSStringCreateWithCharacters): Disambiguate UChar. (JSStringCreateWithUTF8CString): Actually use UTF-8 when creating the string!
• bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16): Use ConvertUTF8ToUTF16().

• wtf/unicode/UTF8.cpp: Added. (WTF::Unicode::inlineUTF8SequenceLengthNonASCII): (WTF::Unicode::inlineUTF8SequenceLength): (WTF::Unicode::UTF8SequenceLength): (WTF::Unicode::decodeUTF8Sequence): (WTF::Unicode::): (WTF::Unicode::ConvertUTF16ToUTF8): (WTF::Unicode::isLegalUTF8): (WTF::Unicode::ConvertUTF8ToUTF16):
• wtf/unicode/UTF8.h: Added. (WTF::Unicode::): Some code moved from ustring.h, some adapted from unicode.org sources.

• JavaScriptCore.exp:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl: Added UTF8.{h,cpp}

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -43 +43 @@
 #include <wtf/Assertions.h>
 #include <wtf/MathExtras.h>
-#include <wtf/unicode/Unicode.h>
+#include <wtf/unicode/UTF8.h>
 
 using namespace WTF;
@@ -515 +515 @@
 {
   UString r = "", s, str = args[0]->toString(exec);
-  bool wasGoodUTF16;
-  CString cstr = str.UTF8String(&wasGoodUTF16);
-  if (!wasGoodUTF16)
+  CString cstr = str.UTF8String(true);
+  if (!cstr.c_str())
     return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
   const char* p = cstr.c_str();