Changeset 121321 in webkit

Timestamp:

Jun 26, 2012, 11:03:35 PM (14 years ago)

Author:

yosin@chromium.org

Message:

[Platform] Change implementation of LocaleICU class to support more UDateFormat.
​https://bugs.webkit.org/show_bug.cgi?id=89967

Reviewed by Kent Tamura.

This patch changes internal functions of LocaleICU class to process
multiple ICU date time format handles in addition to short date time
format handle.

This patch is a part of implementing input type time. I'll add time
format related ICU date time format handles.

No new tests. This patch doesn't change behavior.

• platform/text/LocaleICU.cpp:

(WebCore::LocaleICU::initializeShortDateFormat): Changed to use openDateFormat().
(WebCore::LocaleICU::openDateFormat): Added for common usage of udt_open().
(WebCore::getDateFormatPattern): Added for common usage of udt_toPattern().
(WebCore::localizeFormat): Changed to take String parameter.
(WebCore::LocaleICU::initializeLocalizedDateFormatText): Changed to use getDateFormatPattern.
(WebCore::LocaleICU::createLabelVector): Changed to take UDateFormat parameter.
(WebCore::LocaleICU::initializeCalendar): Changed for helper functions.

• platform/text/LocaleICU.h:

(LocaleICU):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/LocaleICU.cpp (modified) (7 diffs)
• platform/text/LocaleICU.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-26  Yoshifumi Inoue  <yosin@chromium.org>
+
+        [Platform] Change implementation of LocaleICU class to support more UDateFormat.
+        https://bugs.webkit.org/show_bug.cgi?id=89967
+
+        Reviewed by Kent Tamura.
+
+        This patch changes internal functions of LocaleICU class to process
+        multiple ICU date time format handles in addition to short date time
+        format handle.
+
+        This patch is a part of implementing input type time. I'll add time
+        format related ICU date time format handles.
+
+        No new tests. This patch doesn't change behavior.
+
+        * platform/text/LocaleICU.cpp:
+        (WebCore::LocaleICU::initializeShortDateFormat): Changed to use openDateFormat().
+        (WebCore::LocaleICU::openDateFormat): Added for common usage of udt_open().
+        (WebCore::getDateFormatPattern): Added for common usage of udt_toPattern().
+        (WebCore::localizeFormat): Changed to take String parameter.
+        (WebCore::LocaleICU::initializeLocalizedDateFormatText): Changed to use getDateFormatPattern.
+        (WebCore::LocaleICU::createLabelVector): Changed to take UDateFormat parameter.
+        (WebCore::LocaleICU::initializeCalendar): Changed for helper functions.
+        * platform/text/LocaleICU.h:
+        (LocaleICU):
+
 2012-06-26  Luke Macpherson  <macpherson@chromium.org>
 

trunk/Source/WebCore/platform/text/LocaleICU.cpp

@@ -273 +273 @@
     if (m_didCreateShortDateFormat)
         return m_shortDateFormat;
-    const UChar gmtTimezone[3] = {'G', 'M', 'T'};
-    UErrorCode status = U_ZERO_ERROR;
-    m_shortDateFormat = udat_open(UDAT_NONE, UDAT_SHORT, m_locale.data(), gmtTimezone, WTF_ARRAY_LENGTH(gmtTimezone), 0, -1, &status);
+    m_shortDateFormat = openDateFormat(UDAT_NONE, UDAT_SHORT);
     m_didCreateShortDateFormat = true;
     return m_shortDateFormat;
+}
+
+UDateFormat* LocaleICU::openDateFormat(UDateFormatStyle timeStyle, UDateFormatStyle dateStyle) const
+{
+    const UChar gmtTimezone[3] = {'G', 'M', 'T'};
+    UErrorCode status = U_ZERO_ERROR;
+    return udat_open(timeStyle, dateStyle, m_locale.data(), gmtTimezone, WTF_ARRAY_LENGTH(gmtTimezone), 0, -1, &status);
 }
 
@@ -314 +319 @@
 
 #if ENABLE(CALENDAR_PICKER)
+static String getDateFormatPattern(const UDateFormat* dateFormat)
+{
+    if (!dateFormat)
+        return emptyString();
+
+    UErrorCode status = U_ZERO_ERROR;
+    int32_t length = udat_toPattern(dateFormat, TRUE, 0, 0, &status);
+    if (status != U_BUFFER_OVERFLOW_ERROR || !length)
+        return emptyString();
+    Vector<UChar> buffer(length);
+    status = U_ZERO_ERROR;
+    udat_toPattern(dateFormat, TRUE, buffer.data(), length, &status);
+    if (U_FAILURE(status))
+        return emptyString();
+    return String::adopt(buffer);
+}
+
 static inline bool isICUYearSymbol(UChar letter)
 {
@@ -331 +353 @@
 // Specification of the input:
 // http://icu-project.org/apiref/icu4c/classSimpleDateFormat.html#details
-static String localizeFormat(const Vector<UChar>& buffer)
+static String localizeFormat(const String& buffer)
 {
     StringBuilder builder;
     UChar lastChar = 0;
     bool inQuote = false;
-    for (unsigned i = 0; i < buffer.size(); ++i) {
+    for (unsigned i = 0; i < buffer.length(); ++i) {
         if (inQuote) {
             if (buffer[i] == '\'') {
@@ -375 +397 @@
     if (!initializeShortDateFormat())
         return;
-    UErrorCode status = U_ZERO_ERROR;
-    int32_t length = udat_toPattern(m_shortDateFormat, TRUE, 0, 0, &status);
-    if (status != U_BUFFER_OVERFLOW_ERROR)
-        return;
-    Vector<UChar> buffer(length);
-    status = U_ZERO_ERROR;
-    udat_toPattern(m_shortDateFormat, TRUE, buffer.data(), length, &status);
-    if (U_FAILURE(status))
-        return;
-    m_localizedDateFormatText = localizeFormat(buffer);
+    m_localizedDateFormatText = localizeFormat(getDateFormatPattern(m_shortDateFormat));
 }
 
@@ -393 +406 @@
 }
 
-PassOwnPtr<Vector<String> > LocaleICU::createLabelVector(UDateFormatSymbolType type, int32_t startIndex, int32_t size)
-{
-    if (!m_shortDateFormat)
+PassOwnPtr<Vector<String> > LocaleICU::createLabelVector(const UDateFormat* dateFormat, UDateFormatSymbolType type, int32_t startIndex, int32_t size)
+{
+    if (!dateFormat)
         return PassOwnPtr<Vector<String> >();
-    if (udat_countSymbols(m_shortDateFormat, type) != startIndex + size)
+    if (udat_countSymbols(dateFormat, type) != startIndex + size)
         return PassOwnPtr<Vector<String> >();
 
@@ -404 +417 @@
     for (int32_t i = 0; i < size; ++i) {
         UErrorCode status = U_ZERO_ERROR;
-        int32_t length = udat_getSymbols(m_shortDateFormat, type, startIndex + i, 0, 0, &status);
+        int32_t length = udat_getSymbols(dateFormat, type, startIndex + i, 0, 0, &status);
         if (status != U_BUFFER_OVERFLOW_ERROR)
             return PassOwnPtr<Vector<String> >();
         Vector<UChar> buffer(length);
         status = U_ZERO_ERROR;
-        udat_getSymbols(m_shortDateFormat, type, startIndex + i, buffer.data(), length, &status);
+        udat_getSymbols(dateFormat, type, startIndex + i, buffer.data(), length, &status);
         if (U_FAILURE(status))
             return PassOwnPtr<Vector<String> >();
@@ -453 +466 @@
     m_firstDayOfWeek = ucal_getAttribute(udat_getCalendar(m_shortDateFormat), UCAL_FIRST_DAY_OF_WEEK) - UCAL_SUNDAY;
 
-    m_monthLabels = createLabelVector(UDAT_MONTHS, UCAL_JANUARY, 12);
+    m_monthLabels = createLabelVector(m_shortDateFormat, UDAT_MONTHS, UCAL_JANUARY, 12);
     if (!m_monthLabels)
         m_monthLabels = createFallbackMonthLabels();
 
-    m_weekDayShortLabels = createLabelVector(UDAT_SHORT_WEEKDAYS, UCAL_SUNDAY, 7);
+    m_weekDayShortLabels = createLabelVector(m_shortDateFormat, UDAT_SHORT_WEEKDAYS, UCAL_SUNDAY, 7);
     if (!m_weekDayShortLabels)
         m_weekDayShortLabels = createFallbackWeekDayShortLabels();

trunk/Source/WebCore/platform/text/LocaleICU.h

@@ -76 +76 @@
 
     bool initializeShortDateFormat();
+    UDateFormat* openDateFormat(UDateFormatStyle timeStyle, UDateFormatStyle dateStyle) const;
 
 #if ENABLE(CALENDAR_PICKER)
     void initializeLocalizedDateFormatText();
-    PassOwnPtr<Vector<String> > createLabelVector(UDateFormatSymbolType, int32_t startIndex, int32_t size);
+    PassOwnPtr<Vector<String> > createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size);
     void initializeCalendar();
 #endif