diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/text/LocaleICU.h | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/text/LocaleICU.h')
-rw-r--r-- | Source/WebCore/platform/text/LocaleICU.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebCore/platform/text/LocaleICU.h b/Source/WebCore/platform/text/LocaleICU.h index 1cda89f69..a4b8122cb 100644 --- a/Source/WebCore/platform/text/LocaleICU.h +++ b/Source/WebCore/platform/text/LocaleICU.h @@ -47,28 +47,27 @@ namespace WebCore { class LocaleICU : public Localizer { public: static PassOwnPtr<LocaleICU> create(const char* localeString); - static LocaleICU* currentLocale(); virtual ~LocaleICU(); // For LocalizedDate - double parseLocalizedDate(const String&); - String formatLocalizedDate(const DateComponents&); + virtual double parseDateTime(const String&, DateComponents::Type) OVERRIDE; #if ENABLE(CALENDAR_PICKER) - String localizedDateFormatText(); + virtual String dateFormatText() OVERRIDE; - const Vector<String>& monthLabels(); - const Vector<String>& weekDayShortLabels(); - unsigned firstDayOfWeek(); + virtual const Vector<String>& monthLabels() OVERRIDE; + virtual const Vector<String>& weekDayShortLabels() OVERRIDE; + virtual unsigned firstDayOfWeek() OVERRIDE; + virtual bool isRTL() OVERRIDE; #endif -#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) + virtual String dateFormat() OVERRIDE; virtual String timeFormat() OVERRIDE; virtual String shortTimeFormat() OVERRIDE; virtual const Vector<String>& timeAMPMLabels() OVERRIDE; #endif private: - static PassOwnPtr<LocaleICU> createForCurrentLocale(); explicit LocaleICU(const char*); String decimalSymbol(UNumberFormatSymbol); String decimalTextAttribute(UNumberFormatTextAttribute); @@ -85,11 +84,11 @@ private: void initializeCalendar(); #endif -#if ENABLE(CALENDAR_PICKER) || ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) +#if ENABLE(CALENDAR_PICKER) || ENABLE(INPUT_MULTIPLE_FIELDS_UI) PassOwnPtr<Vector<String> > createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size); #endif -#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) void initializeDateTimeFormat(); #endif @@ -106,7 +105,8 @@ private: unsigned m_firstDayOfWeek; #endif -#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) +#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) + String m_dateFormat; UDateFormat* m_mediumTimeFormat; UDateFormat* m_shortTimeFormat; Vector<String> m_timeAMPMLabels; |