| Index: sky/engine/wtf/unicode/icu/CollatorICU.cpp
|
| diff --git a/sky/engine/wtf/unicode/icu/CollatorICU.cpp b/sky/engine/wtf/unicode/icu/CollatorICU.cpp
|
| index a21e9325a5add6c86844373e4bb8b07ca1e06ffb..c667a639b32d633ee71975c7192cefc0676dad8e 100644
|
| --- a/sky/engine/wtf/unicode/icu/CollatorICU.cpp
|
| +++ b/sky/engine/wtf/unicode/icu/CollatorICU.cpp
|
| @@ -37,11 +37,6 @@
|
| #include <string.h>
|
| #include <unicode/ucol.h>
|
|
|
| -#if OS(MACOSX)
|
| -#include "wtf/RetainPtr.h"
|
| -#include <CoreFoundation/CoreFoundation.h>
|
| -#endif
|
| -
|
| namespace WTF {
|
|
|
| static UCollator* cachedCollator;
|
| @@ -60,18 +55,7 @@ Collator::Collator(const char* locale)
|
|
|
| PassOwnPtr<Collator> Collator::userDefault()
|
| {
|
| -#if OS(MACOSX) && USE(CF)
|
| - // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
|
| - RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
|
| - CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
|
| - char buf[256];
|
| - if (!collationOrder)
|
| - return adoptPtr(new Collator(""));
|
| - CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII);
|
| - return adoptPtr(new Collator(buf));
|
| -#else
|
| return adoptPtr(new Collator(0));
|
| -#endif
|
| }
|
|
|
| Collator::~Collator()
|
|
|