Use ICU's case mapping API for Greek uppercasing

third_party/WebKit/Source/wtf/text/StringImpl.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller ( mueller@kde.org )
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 21 matching lines @@
 #include "wtf/allocator/PartitionAlloc.h"
 #include "wtf/allocator/Partitions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/AtomicStringTable.h"
 #include "wtf/text/CharacterNames.h"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/StringToNumber.h"
 #include <algorithm>
 #include <memory>
-#include <unicode/translit.h>
-#include <unicode/unistr.h>
 
 #ifdef STRING_STATS
 #include "wtf/DataLog.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include <unistd.h>
 #endif
 
@@ skipping 742 matching lines @@
       return output.release();
     }
     if (status != U_BUFFER_OVERFLOW_ERROR)
       return originalString;
     // Expand the buffer.
     output = StringImpl::createUninitialized(targetLength, data16);
   } while (true);
 }
 
 PassRefPtr<StringImpl> StringImpl::lower(const AtomicString& localeIdentifier) {
-  // Use the more-optimized code path most of the time.
+  // Use the more optimized code path most of the time.
   // Only Turkic (tr and az) languages and Lithuanian requires
   // locale-specific lowercasing rules. Even though CLDR has el-Lower,
   // it's identical to the locale-agnostic lowercasing. Context-dependent
   // handling of Greek capital sigma is built into the common lowercasing
   // function in ICU.
   const char* localeForConversion = 0;
   if (localeIdMatchesLang(localeIdentifier, "tr") ||
       localeIdMatchesLang(localeIdentifier, "az"))
     localeForConversion = "tr";
   else if (localeIdMatchesLang(localeIdentifier, "lt"))
     localeForConversion = "lt";
   else
     return lower();
 
   if (m_length > static_cast<unsigned>(numeric_limits<int32_t>::max()))
     CRASH();
   int length = m_length;
 
   RefPtr<StringImpl> upconverted = upconvertedString();
   const UChar* source16 = upconverted->characters16();
   return caseConvert(source16, length, u_strToLower, localeForConversion, this);
 }
 
 PassRefPtr<StringImpl> StringImpl::upper(const AtomicString& localeIdentifier) {
   // Use the more-optimized code path most of the time.
-  // Only Turkic (tr and az) languages and Greek require locale-specific
-  // lowercasing rules.
-  icu::UnicodeString transliteratorId;
+  // Only Turkic (tr and az) languages, Greek and Lithuanian require
+  // locale-specific uppercasing rules.
   const char* localeForConversion = 0;
   if (localeIdMatchesLang(localeIdentifier, "tr") ||
       localeIdMatchesLang(localeIdentifier, "az"))
     localeForConversion = "tr";
   else if (localeIdMatchesLang(localeIdentifier, "el"))
-    transliteratorId = UNICODE_STRING_SIMPLE("el-Upper");
+    localeForConversion = "el";
   else if (localeIdMatchesLang(localeIdentifier, "lt"))
     localeForConversion = "lt";
   else
     return upper();
 
   if (m_length > static_cast<unsigned>(numeric_limits<int32_t>::max()))
     CRASH();
   int length = m_length;
 
   RefPtr<StringImpl> upconverted = upconvertedString();
   const UChar* source16 = upconverted->characters16();
 
-  if (localeForConversion)
-    return caseConvert(source16, length, u_strToUpper, localeForConversion,
-                       this);
-
-  // TODO(jungshik): Cache transliterator if perf penaly warrants it for Greek.
-  UErrorCode status = U_ZERO_ERROR;
-  std::unique_ptr<icu::Transliterator> translit =
-      wrapUnique(icu::Transliterator::createInstance(transliteratorId,
-                                                     UTRANS_FORWARD, status));
-  if (U_FAILURE(status))
-    return upper();
-
-  // target will be copy-on-write.
-  icu::UnicodeString target(false, source16, length);
-  translit->transliterate(target);
-
-  return create(target.getBuffer(), target.length());
+  return caseConvert(source16, length, u_strToUpper, localeForConversion, this);
 }
 
 PassRefPtr<StringImpl> StringImpl::fill(UChar character) {
   if (!(character & ~0x7F)) {
     LChar* data;
     RefPtr<StringImpl> newImpl = createUninitialized(m_length, data);
     for (unsigned i = 0; i < m_length; ++i)
       data[i] = static_cast<LChar>(character);
     return newImpl.release();
   }
@@ skipping 1305 matching lines @@
     } else if (localeIdMatchesLang(localeIdentifier, "lt")) {
       // TODO(rob.buis) implement upper-casing rules for lt
       // like in StringImpl::upper(locale).
     }
   }
 
   return toUpper(c);
 }
 
 }  // namespace WTF