Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
diff --git a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
index f5efcee32e0fc38472729a8417e8cfc73d7ccfe3..131cb32ea55e7b502f7cfa74d2f839dd961aa292 100644
--- a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
+++ b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
@@ -40,99 +40,100 @@ namespace WTF {
static UCollator* cachedCollator;
static char cachedEquivalentLocale[Collator::ulocFullnameCapacity];
-static Mutex& cachedCollatorMutex()
-{
- DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex);
- return mutex;
+static Mutex& cachedCollatorMutex() {
+ DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex);
+ return mutex;
}
Collator::Collator(const char* locale)
- : m_collator(0)
- , m_locale(locale ? strdup(locale) : 0)
- , m_lowerFirst(false)
-{
- setEquivalentLocale(m_locale, m_equivalentLocale);
+ : m_collator(0),
+ m_locale(locale ? strdup(locale) : 0),
+ m_lowerFirst(false) {
+ setEquivalentLocale(m_locale, m_equivalentLocale);
}
-PassOwnPtr<Collator> Collator::userDefault()
-{
- return adoptPtr(new Collator(0));
+PassOwnPtr<Collator> Collator::userDefault() {
+ return adoptPtr(new Collator(0));
}
-Collator::~Collator()
-{
- releaseCollator();
- free(m_locale);
+Collator::~Collator() {
+ releaseCollator();
+ free(m_locale);
}
-void Collator::setOrderLowerFirst(bool lowerFirst)
-{
- m_lowerFirst = lowerFirst;
+void Collator::setOrderLowerFirst(bool lowerFirst) {
+ m_lowerFirst = lowerFirst;
}
-Collator::Result Collator::collate(const UChar* lhs, size_t lhsLength, const UChar* rhs, size_t rhsLength) const
-{
- if (!m_collator)
- createCollator();
+Collator::Result Collator::collate(const UChar* lhs,
+ size_t lhsLength,
+ const UChar* rhs,
+ size_t rhsLength) const {
+ if (!m_collator)
+ createCollator();
- return static_cast<Result>(ucol_strcoll(m_collator, lhs, lhsLength, rhs, rhsLength));
+ return static_cast<Result>(
+ ucol_strcoll(m_collator, lhs, lhsLength, rhs, rhsLength));
}
-void Collator::createCollator() const
-{
- ASSERT(!m_collator);
- UErrorCode status = U_ZERO_ERROR;
-
- {
- Locker<Mutex> lock(cachedCollatorMutex());
- if (cachedCollator) {
- UColAttributeValue cachedCollatorLowerFirst = ucol_getAttribute(cachedCollator, UCOL_CASE_FIRST, &status);
- ASSERT(U_SUCCESS(status));
-
- if (0 == strcmp(cachedEquivalentLocale, m_equivalentLocale)
- && ((UCOL_LOWER_FIRST == cachedCollatorLowerFirst && m_lowerFirst) || (UCOL_UPPER_FIRST == cachedCollatorLowerFirst && !m_lowerFirst))) {
- m_collator = cachedCollator;
- cachedCollator = 0;
- cachedEquivalentLocale[0] = 0;
- return;
- }
- }
+void Collator::createCollator() const {
+ ASSERT(!m_collator);
+ UErrorCode status = U_ZERO_ERROR;
+
+ {
+ Locker<Mutex> lock(cachedCollatorMutex());
+ if (cachedCollator) {
+ UColAttributeValue cachedCollatorLowerFirst =
+ ucol_getAttribute(cachedCollator, UCOL_CASE_FIRST, &status);
+ ASSERT(U_SUCCESS(status));
+
+ if (0 == strcmp(cachedEquivalentLocale, m_equivalentLocale) &&
+ ((UCOL_LOWER_FIRST == cachedCollatorLowerFirst && m_lowerFirst) ||
+ (UCOL_UPPER_FIRST == cachedCollatorLowerFirst && !m_lowerFirst))) {
+ m_collator = cachedCollator;
+ cachedCollator = 0;
+ cachedEquivalentLocale[0] = 0;
+ return;
+ }
}
-
- m_collator = ucol_open(m_locale, &status);
- if (U_FAILURE(status)) {
- status = U_ZERO_ERROR;
- m_collator = ucol_open("", &status); // Fallback to Unicode Collation Algorithm.
- }
- ASSERT(U_SUCCESS(status));
-
- ucol_setAttribute(m_collator, UCOL_CASE_FIRST, m_lowerFirst ? UCOL_LOWER_FIRST : UCOL_UPPER_FIRST, &status);
- ASSERT(U_SUCCESS(status));
-
- ucol_setAttribute(m_collator, UCOL_NORMALIZATION_MODE, UCOL_ON, &status);
- ASSERT(U_SUCCESS(status));
+ }
+
+ m_collator = ucol_open(m_locale, &status);
+ if (U_FAILURE(status)) {
+ status = U_ZERO_ERROR;
+ m_collator =
+ ucol_open("", &status); // Fallback to Unicode Collation Algorithm.
+ }
+ ASSERT(U_SUCCESS(status));
+
+ ucol_setAttribute(m_collator, UCOL_CASE_FIRST,
+ m_lowerFirst ? UCOL_LOWER_FIRST : UCOL_UPPER_FIRST,
+ &status);
+ ASSERT(U_SUCCESS(status));
+
+ ucol_setAttribute(m_collator, UCOL_NORMALIZATION_MODE, UCOL_ON, &status);
+ ASSERT(U_SUCCESS(status));
}
-void Collator::releaseCollator()
-{
- {
- Locker<Mutex> lock(cachedCollatorMutex());
- if (cachedCollator)
- ucol_close(cachedCollator);
- cachedCollator = m_collator;
- strncpy(cachedEquivalentLocale, m_equivalentLocale, ulocFullnameCapacity);
- m_collator = 0;
- }
+void Collator::releaseCollator() {
+ {
+ Locker<Mutex> lock(cachedCollatorMutex());
+ if (cachedCollator)
+ ucol_close(cachedCollator);
+ cachedCollator = m_collator;
+ strncpy(cachedEquivalentLocale, m_equivalentLocale, ulocFullnameCapacity);
m_collator = 0;
+ }
+ m_collator = 0;
}
-void Collator::setEquivalentLocale(const char* locale, char* equivalentLocale)
-{
- UErrorCode status = U_ZERO_ERROR;
- UBool isAvailable;
- ucol_getFunctionalEquivalent(equivalentLocale, ulocFullnameCapacity, "collation", locale, &isAvailable, &status);
- if (U_FAILURE(status))
- strcpy(equivalentLocale, "root");
+void Collator::setEquivalentLocale(const char* locale, char* equivalentLocale) {
+ UErrorCode status = U_ZERO_ERROR;
+ UBool isAvailable;
+ ucol_getFunctionalEquivalent(equivalentLocale, ulocFullnameCapacity,
+ "collation", locale, &isAvailable, &status);
+ if (U_FAILURE(status))
+ strcpy(equivalentLocale, "root");
}
-} // namespace WTF
+} // namespace WTF
« no previous file with comments | « third_party/WebKit/Source/wtf/text/WTFStringTest.cpp ('k') | third_party/WebKit/Source/wtf/text/icu/UnicodeIcu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698