Changeset 82809 in webkit
- Timestamp:
- Apr 4, 2011 2:20:45 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r82808 r82809 1 2011-04-04 Nico Weber <thakis@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Prefer a using directive over qualified names in LocalizedNumberICU.cpp 6 https://bugs.webkit.org/show_bug.cgi?id=57742 7 8 Requested by ap in https://bugs.webkit.org/show_bug.cgi?id=57715 9 10 * platform/text/LocalizedNumberICU.cpp: 11 (WebCore::createFormatterForCurrentLocale): 12 (WebCore::numberFormatter): 13 (WebCore::parseLocalizedNumber): 14 (WebCore::formatLocalizedNumber): 15 1 16 2011-04-04 Andrey Adaikin <aandrey@google.com> 2 17 -
trunk/Source/WebCore/platform/text/LocalizedNumberICU.cpp
r82787 r82809 38 38 #include <wtf/PassOwnPtr.h> 39 39 40 using namespace icu; 40 41 using namespace std; 41 42 42 43 namespace WebCore { 43 44 44 static PassOwnPtr< icu::NumberFormat> createFormatterForCurrentLocale()45 static PassOwnPtr<NumberFormat> createFormatterForCurrentLocale() 45 46 { 46 47 UErrorCode status = U_ZERO_ERROR; 47 OwnPtr< icu::NumberFormat> formatter = adoptPtr(icu::NumberFormat::createInstance(status));48 OwnPtr<NumberFormat> formatter = adoptPtr(NumberFormat::createInstance(status)); 48 49 return U_SUCCESS(status) ? formatter.release() : 0; 49 50 } 50 51 51 52 // This might return 0. 52 static icu::NumberFormat* numberFormatter()53 static NumberFormat* numberFormatter() 53 54 { 54 55 ASSERT(isMainThread()); 55 static icu::NumberFormat* formatter = createFormatterForCurrentLocale().leakPtr();56 static NumberFormat* formatter = createFormatterForCurrentLocale().leakPtr(); 56 57 return formatter; 57 58 } … … 61 62 if (numberString.isEmpty()) 62 63 return numeric_limits<double>::quiet_NaN(); 63 icu::NumberFormat* formatter = numberFormatter();64 NumberFormat* formatter = numberFormatter(); 64 65 if (!formatter) 65 66 return numeric_limits<double>::quiet_NaN(); 66 icu::UnicodeString numberUnicodeString(numberString.characters(), numberString.length());67 icu::Formattable result;68 icu::ParsePosition position(0);67 UnicodeString numberUnicodeString(numberString.characters(), numberString.length()); 68 Formattable result; 69 ParsePosition position(0); 69 70 formatter->parse(numberUnicodeString, result, position); 70 71 if (position.getIndex() != numberUnicodeString.length()) … … 77 78 String formatLocalizedNumber(double number, unsigned fractionDigits) 78 79 { 79 icu::NumberFormat* formatter = numberFormatter();80 NumberFormat* formatter = numberFormatter(); 80 81 if (!formatter) 81 82 return String(); 82 icu::UnicodeString result;83 UnicodeString result; 83 84 formatter->setMaximumFractionDigits(clampToInteger(fractionDigits)); 84 85 formatter->format(number, result);
Note: See TracChangeset
for help on using the changeset viewer.