Changeset 30842 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Mar 6, 2008, 9:50:08 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

<rdar://problem/5687269> Need to create a Collator abstraction for WebCore and JavaScriptCore

File:

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

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -31 +31 @@
 #include "regexp_object.h"
 #include <wtf/MathExtras.h>
-#include <wtf/unicode/Unicode.h>
-
-#if PLATFORM(CF)
-#include <CoreFoundation/CoreFoundation.h>
-#elif PLATFORM(WIN_OS)
-#include <windows.h>
-#endif
+#include <wtf/unicode/Collator.h>
 
 using namespace WTF;
@@ -295 +289 @@
   return substitutedReplacement;
 }
+
 static inline int localeCompare(const UString& a, const UString& b)
 {
-#if PLATFORM(WIN_OS)
-    int retval = CompareStringW(LOCALE_USER_DEFAULT, 0,
-                                reinterpret_cast<LPCWSTR>(a.data()), a.size(),
-                                reinterpret_cast<LPCWSTR>(b.data()), b.size());
-    return !retval ? retval : retval - 2;
-#elif PLATFORM(CF)
-    CFStringRef sa = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, reinterpret_cast<const UniChar*>(a.data()), a.size(), kCFAllocatorNull);
-    CFStringRef sb = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, reinterpret_cast<const UniChar*>(b.data()), b.size(), kCFAllocatorNull);
-
-    int retval = CFStringCompare(sa, sb, kCFCompareLocalized);
-
-    CFRelease(sa);
-    CFRelease(sb);
-
-    return retval;
-#else
-    return compare(a, b);
-#endif
+    return Collator::userDefault()->collate(reinterpret_cast<const ::UChar*>(a.data()), a.size(), reinterpret_cast<const ::UChar*>(b.data()), b.size());
 }