Changeset 128147 in webkit
- Timestamp:
- Sep 10, 2012 10:17:56 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 9 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r128144 r128147 1 2012-09-10 Keishi Hattori <keishi@webkit.org> 2 3 Rename NumberLocalizer to Localizer 4 https://bugs.webkit.org/show_bug.cgi?id=96350 5 6 Reviewed by Kent Tamura. 7 8 Renaming NumberLocalizer to Localizer so we can unify our localization methods into this class in the future. 9 10 No new tests. No behavior change. 11 12 * WebCore.gypi: 13 * WebCore.xcodeproj/project.pbxproj: 14 * platform/text/LocaleICU.cpp: 15 (WebCore::LocaleICU::initializeLocalizerData): 16 * platform/text/LocaleICU.h: 17 (LocaleICU): 18 * platform/text/LocaleWin.cpp: 19 (WebCore::LocaleWin::initializeLocalizerData): 20 * platform/text/LocaleWin.h: 21 (LocaleWin): 22 * platform/text/Localizer.cpp: Renamed from Source/WebCore/platform/text/NumberLocalizer.cpp. 23 (WebCore): 24 (WebCore::Localizer::~Localizer): 25 (WebCore::Localizer::setLocalizerData): 26 (WebCore::Localizer::convertToLocalizedNumber): 27 (WebCore::matches): 28 (WebCore::Localizer::detectSignAndGetDigitRange): 29 (WebCore::Localizer::matchedDecimalSymbolIndex): 30 (WebCore::Localizer::convertFromLocalizedNumber): 31 (WebCore::Localizer::localizedDecimalSeparator): 32 * platform/text/Localizer.h: Renamed from Source/WebCore/platform/text/NumberLocalizer.h. 33 (WebCore): 34 (Localizer): 35 (WebCore::Localizer::Localizer): 36 * platform/text/mac/LocaleMac.h: 37 (LocaleMac): 38 * platform/text/mac/LocaleMac.mm: 39 (WebCore::LocaleMac::initializeLocalizerData): 40 1 41 2012-09-10 Dan Bernstein <mitz@apple.com> 2 42 -
trunk/Source/WebCore/WebCore.gypi
r128083 r128147 5678 5678 'platform/text/LocalizedNumberICU.cpp', 5679 5679 'platform/text/LocalizedNumberNone.cpp', 5680 'platform/text/ NumberLocalizer.cpp',5681 'platform/text/ NumberLocalizer.h',5680 'platform/text/Localizer.cpp', 5681 'platform/text/Localizer.h', 5682 5682 'platform/text/ParserUtilities.h', 5683 5683 'platform/text/QuotedPrintable.h', -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r128132 r128147 6231 6231 F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = F5142C68123F12B000F5BD4C /* LocalizedNumber.h */; }; 6232 6232 F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */; }; 6233 F544F78815CFB2A800AF33A8 /* NumberLocalizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */; };6234 F544F78915CFB2A800AF33A8 /* NumberLocalizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */; };6233 F544F78815CFB2A800AF33A8 /* Localizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F544F78615CFB2A800AF33A8 /* Localizer.cpp */; }; 6234 F544F78915CFB2A800AF33A8 /* Localizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F544F78715CFB2A800AF33A8 /* Localizer.h */; }; 6235 6235 F55B3DAD1251F12D003EF269 /* BaseTextInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */; }; 6236 6236 F55B3DAE1251F12D003EF269 /* BaseTextInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */; }; … … 13626 13626 F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 13627 13627 F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmptyClients.cpp; sourceTree = "<group>"; }; 13628 F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumberLocalizer.cpp; sourceTree = "<group>"; };13629 F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberLocalizer.h; sourceTree = "<group>"; };13628 F544F78615CFB2A800AF33A8 /* Localizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Localizer.cpp; sourceTree = "<group>"; }; 13629 F544F78715CFB2A800AF33A8 /* Localizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Localizer.h; sourceTree = "<group>"; }; 13630 13630 F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseTextInputType.cpp; sourceTree = "<group>"; }; 13631 13631 F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTextInputType.h; sourceTree = "<group>"; }; … … 20011 20011 A5732B0E136A1715005C8D7C /* LocalizedDateNone.cpp */, 20012 20012 F5142C68123F12B000F5BD4C /* LocalizedNumber.h */, 20013 F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */,20014 F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */,20013 F544F78615CFB2A800AF33A8 /* Localizer.cpp */, 20014 F544F78715CFB2A800AF33A8 /* Localizer.h */, 20015 20015 BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */, 20016 20016 379E371413736A6600B9E919 /* QuotedPrintable.cpp */, … … 24388 24388 F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */, 24389 24389 935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */, 24390 F544F78915CFB2A800AF33A8 /* Localizer.h in Headers */, 24390 24391 BCE1C41B0D982980003B02F2 /* Location.h in Headers */, 24391 24392 A8239E0109B3CF8A00B60641 /* Logging.h in Headers */, … … 24505 24506 93500F3213FDE3BE0099EC24 /* NSScrollerImpDetails.h in Headers */, 24506 24507 F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */, 24507 F544F78915CFB2A800AF33A8 /* NumberLocalizer.h in Headers */,24508 24508 1A569D120D7E2B82007C3983 /* objc_class.h in Headers */, 24509 24509 1A569D140D7E2B82007C3983 /* objc_header.h in Headers */, … … 27695 27695 C046E1AC1208A9FE00BA2CF7 /* LocalizedStrings.cpp in Sources */, 27696 27696 BC25B52A131C6D3900180E10 /* LocalizedStringsMac.cpp in Sources */, 27697 F544F78815CFB2A800AF33A8 /* Localizer.cpp in Sources */, 27697 27698 BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */, 27698 27699 A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */, … … 27789 27790 52F52E1114A0134F00ACC397 /* NSScrollerImpDetails.mm in Sources */, 27790 27791 F55B3DC71251F12D003EF269 /* NumberInputType.cpp in Sources */, 27791 F544F78815CFB2A800AF33A8 /* NumberLocalizer.cpp in Sources */,27792 27792 1A569D130D7E2B82007C3983 /* objc_class.mm in Sources */, 27793 27793 1A569D160D7E2B82007C3983 /* objc_instance.mm in Sources */, -
trunk/Source/WebCore/platform/text/LocaleICU.cpp
r124459 r128147 113 113 } 114 114 115 void LocaleICU::initialize NumberLocalizerData()115 void LocaleICU::initializeLocalizerData() 116 116 { 117 117 if (m_didCreateDecimalFormat) … … 137 137 symbols.append(decimalSymbol(UNUM_GROUPING_SEPARATOR_SYMBOL)); 138 138 ASSERT(symbols.size() == DecimalSymbolsSize); 139 set NumberLocalizerData(symbols, decimalTextAttribute(UNUM_POSITIVE_PREFIX), decimalTextAttribute(UNUM_POSITIVE_SUFFIX), decimalTextAttribute(UNUM_NEGATIVE_PREFIX), decimalTextAttribute(UNUM_NEGATIVE_SUFFIX));139 setLocalizerData(symbols, decimalTextAttribute(UNUM_POSITIVE_PREFIX), decimalTextAttribute(UNUM_POSITIVE_SUFFIX), decimalTextAttribute(UNUM_NEGATIVE_PREFIX), decimalTextAttribute(UNUM_NEGATIVE_SUFFIX)); 140 140 } 141 141 -
trunk/Source/WebCore/platform/text/LocaleICU.h
r124459 r128147 33 33 34 34 #include "DateComponents.h" 35 #include " NumberLocalizer.h"35 #include "Localizer.h" 36 36 #include <unicode/udat.h> 37 37 #include <unicode/unum.h> … … 45 45 // We should use this class only for LocalizedNumberICU.cpp, LocalizedDateICU.cpp, 46 46 // and LocalizedNumberICUTest.cpp. 47 class LocaleICU : public NumberLocalizer {47 class LocaleICU : public Localizer { 48 48 public: 49 49 static PassOwnPtr<LocaleICU> create(const char* localeString); … … 73 73 String decimalSymbol(UNumberFormatSymbol); 74 74 String decimalTextAttribute(UNumberFormatTextAttribute); 75 virtual void initialize NumberLocalizerData() OVERRIDE;75 virtual void initializeLocalizerData() OVERRIDE; 76 76 77 77 bool detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex); -
trunk/Source/WebCore/platform/text/LocaleWin.cpp
r126126 r128147 724 724 #endif 725 725 726 void LocaleWin::initialize NumberLocalizerData()726 void LocaleWin::initializeLocalizerData() 727 727 { 728 728 if (m_didInitializeNumberData) … … 792 792 } 793 793 m_didInitializeNumberData = true; 794 set NumberLocalizerData(symbols, emptyString(), emptyString(), negativePrefix, negativeSuffix);795 } 796 797 } 794 setLocalizerData(symbols, emptyString(), emptyString(), negativePrefix, negativeSuffix); 795 } 796 797 } -
trunk/Source/WebCore/platform/text/LocaleWin.h
r126126 r128147 32 32 #define LocaleWin_h 33 33 34 #include " NumberLocalizer.h"34 #include "Localizer.h" 35 35 #include <windows.h> 36 36 #include <wtf/Forward.h> … … 43 43 struct DateFormatToken; 44 44 45 class LocaleWin : public NumberLocalizer {45 class LocaleWin : public Localizer { 46 46 public: 47 47 static PassOwnPtr<LocaleWin> create(LCID); … … 86 86 void ensureWeekDayShortLabels(); 87 87 #endif 88 // NumberLocalizer function:89 virtual void initialize NumberLocalizerData() OVERRIDE;88 // Localizer function: 89 virtual void initializeLocalizerData() OVERRIDE; 90 90 91 91 LCID m_lcid; -
trunk/Source/WebCore/platform/text/Localizer.cpp
r128146 r128147 30 30 31 31 #include "config.h" 32 #include " NumberLocalizer.h"32 #include "Localizer.h" 33 33 34 34 #include <wtf/text/StringBuilder.h> … … 36 36 namespace WebCore { 37 37 38 NumberLocalizer::~NumberLocalizer()38 Localizer::~Localizer() 39 39 { 40 40 } 41 41 42 void NumberLocalizer::setNumberLocalizerData(const Vector<String, DecimalSymbolsSize>& symbols, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix)42 void Localizer::setLocalizerData(const Vector<String, DecimalSymbolsSize>& symbols, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix) 43 43 { 44 44 for (size_t i = 0; i < symbols.size(); ++i) { … … 51 51 m_negativeSuffix = negativeSuffix; 52 52 ASSERT(!m_positivePrefix.isEmpty() || !m_positiveSuffix.isEmpty() || !m_negativePrefix.isEmpty() || !m_negativeSuffix.isEmpty()); 53 m_has NumberLocalizerData = true;53 m_hasLocalizerData = true; 54 54 } 55 55 56 String NumberLocalizer::convertToLocalizedNumber(const String& input)56 String Localizer::convertToLocalizedNumber(const String& input) 57 57 { 58 initialize NumberLocalizerData();59 if (!m_has NumberLocalizerData || input.isEmpty())58 initializeLocalizerData(); 59 if (!m_hasLocalizerData || input.isEmpty()) 60 60 return input; 61 61 … … 112 112 } 113 113 114 bool NumberLocalizer::detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex)114 bool Localizer::detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex) 115 115 { 116 116 startIndex = 0; … … 140 140 } 141 141 142 unsigned NumberLocalizer::matchedDecimalSymbolIndex(const String& input, unsigned& position)142 unsigned Localizer::matchedDecimalSymbolIndex(const String& input, unsigned& position) 143 143 { 144 144 for (unsigned symbolIndex = 0; symbolIndex < DecimalSymbolsSize; ++symbolIndex) { … … 151 151 } 152 152 153 String NumberLocalizer::convertFromLocalizedNumber(const String& localized)153 String Localizer::convertFromLocalizedNumber(const String& localized) 154 154 { 155 initialize NumberLocalizerData();155 initializeLocalizerData(); 156 156 String input = localized.stripWhiteSpace(); 157 if (!m_has NumberLocalizerData || input.isEmpty())157 if (!m_hasLocalizerData || input.isEmpty()) 158 158 return input; 159 159 … … 186 186 187 187 #if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) 188 String NumberLocalizer::localizedDecimalSeparator()188 String Localizer::localizedDecimalSeparator() 189 189 { 190 initialize NumberLocalizerData();190 initializeLocalizerData(); 191 191 return m_decimalSymbols[DecimalSeparatorIndex]; 192 192 } -
trunk/Source/WebCore/platform/text/Localizer.h
r128146 r128147 24 24 */ 25 25 26 #ifndef NumberLocalizer_h27 #define NumberLocalizer_h26 #ifndef Localizer_h 27 #define Localizer_h 28 28 29 29 #include <wtf/text/WTFString.h> … … 31 31 namespace WebCore { 32 32 33 class NumberLocalizer {33 class Localizer { 34 34 public: 35 35 String convertToLocalizedNumber(const String&); … … 38 38 String localizedDecimalSeparator(); 39 39 #endif 40 virtual ~ NumberLocalizer();40 virtual ~Localizer(); 41 41 42 42 protected: … … 48 48 }; 49 49 50 NumberLocalizer() : m_hasNumberLocalizerData(false) { }51 virtual void initialize NumberLocalizerData() = 0;52 void set NumberLocalizerData(const Vector<String, DecimalSymbolsSize>&, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix);50 Localizer() : m_hasLocalizerData(false) { } 51 virtual void initializeLocalizerData() = 0; 52 void setLocalizerData(const Vector<String, DecimalSymbolsSize>&, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix); 53 53 54 54 private: … … 61 61 String m_negativePrefix; 62 62 String m_negativeSuffix; 63 bool m_has NumberLocalizerData;63 bool m_hasLocalizerData; 64 64 }; 65 65 -
trunk/Source/WebCore/platform/text/mac/LocaleMac.h
r124979 r128147 32 32 #define LocaleMac_h 33 33 34 #include " NumberLocalizer.h"34 #include "Localizer.h" 35 35 #include <wtf/Forward.h> 36 36 #include <wtf/RetainPtr.h> … … 45 45 class DateComponents; 46 46 47 class LocaleMac : public NumberLocalizer {47 class LocaleMac : public Localizer { 48 48 public: 49 49 static PassOwnPtr<LocaleMac> create(const String&); … … 70 70 explicit LocaleMac(const String&); 71 71 NSDateFormatter *createShortDateFormatter(); 72 virtual void initialize NumberLocalizerData() OVERRIDE;72 virtual void initializeLocalizerData() OVERRIDE; 73 73 74 74 RetainPtr<NSLocale> m_locale; -
trunk/Source/WebCore/platform/text/mac/LocaleMac.mm
r124979 r128147 271 271 #endif 272 272 273 void LocaleMac::initialize NumberLocalizerData()273 void LocaleMac::initializeLocalizerData() 274 274 { 275 275 if (m_didInitializeNumberData) … … 299 299 String negativePrefix([formatter.get() negativePrefix]); 300 300 String negativeSuffix([formatter.get() negativeSuffix]); 301 set NumberLocalizerData(symbols, positivePrefix, positiveSuffix, negativePrefix, negativeSuffix);302 } 303 304 } 301 setLocalizerData(symbols, positivePrefix, positiveSuffix, negativePrefix, negativeSuffix); 302 } 303 304 }
Note: See TracChangeset
for help on using the changeset viewer.