| Index: third_party/WebKit/Source/wtf/text/Collator.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/Collator.h b/third_party/WebKit/Source/wtf/text/Collator.h
|
| index 1c54753ffb9a394ef44ea7700a901703d0afac07..2dcabdc22cd5c7aa3183039adee98a477534cc1e 100644
|
| --- a/third_party/WebKit/Source/wtf/text/Collator.h
|
| +++ b/third_party/WebKit/Source/wtf/text/Collator.h
|
| @@ -40,33 +40,35 @@ struct UCollator;
|
| namespace WTF {
|
|
|
| class WTF_EXPORT Collator {
|
| - WTF_MAKE_NONCOPYABLE(Collator);
|
| - USING_FAST_MALLOC(Collator);
|
| -public:
|
| - enum Result { Equal = 0, Greater = 1, Less = -1 };
|
| + WTF_MAKE_NONCOPYABLE(Collator);
|
| + USING_FAST_MALLOC(Collator);
|
|
|
| - // From ICU's uloc.h (ULOC_FULLNAME_CAPACITY)
|
| - static const size_t ulocFullnameCapacity = 157;
|
| + public:
|
| + enum Result { Equal = 0, Greater = 1, Less = -1 };
|
|
|
| - Collator(const char* locale); // Parsing is lenient; e.g. language identifiers (such as "en-US") are accepted, too.
|
| - ~Collator();
|
| - void setOrderLowerFirst(bool);
|
| + // From ICU's uloc.h (ULOC_FULLNAME_CAPACITY)
|
| + static const size_t ulocFullnameCapacity = 157;
|
|
|
| - static PassOwnPtr<Collator> userDefault();
|
| + Collator(
|
| + const char*
|
| + locale); // Parsing is lenient; e.g. language identifiers (such as "en-US") are accepted, too.
|
| + ~Collator();
|
| + void setOrderLowerFirst(bool);
|
|
|
| - Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;
|
| + static PassOwnPtr<Collator> userDefault();
|
|
|
| -private:
|
| - void createCollator() const;
|
| - void releaseCollator();
|
| - void setEquivalentLocale(const char*, char*);
|
| - mutable UCollator* m_collator;
|
| + Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;
|
|
|
| - char* m_locale;
|
| - char m_equivalentLocale[ulocFullnameCapacity];
|
| - bool m_lowerFirst;
|
| -};
|
| + private:
|
| + void createCollator() const;
|
| + void releaseCollator();
|
| + void setEquivalentLocale(const char*, char*);
|
| + mutable UCollator* m_collator;
|
|
|
| + char* m_locale;
|
| + char m_equivalentLocale[ulocFullnameCapacity];
|
| + bool m_lowerFirst;
|
| +};
|
| }
|
|
|
| using WTF::Collator;
|
|
|