Source/WebCore: Rename ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPL...

https://bugs.webkit.org/show_bug.cgi?id=97640

This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature
flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple
fields date/time input UI other than input type "time".

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

* css/html.css:
* css/themeWin.css:
* html/DateTimeFieldsState.cpp:
* html/DateTimeFieldsState.h:
* html/TimeInputType.cpp:
(WebCore):
* html/TimeInputType.h:
(TimeInputType):
* html/shadow/DateTimeEditElement.cpp:
* html/shadow/DateTimeEditElement.h:
* html/shadow/DateTimeFieldElement.cpp:
* html/shadow/DateTimeFieldElement.h:
* html/shadow/DateTimeFieldElements.cpp:
* html/shadow/DateTimeFieldElements.h:
* html/shadow/DateTimeNumericFieldElement.cpp:
* html/shadow/DateTimeNumericFieldElement.h:
* html/shadow/DateTimeSymbolicFieldElement.cpp:
* html/shadow/DateTimeSymbolicFieldElement.h:
* platform/LocalizedStrings.h:
(WebCore):
* platform/text/DateTimeFormat.cpp:
* platform/text/DateTimeFormat.h:
* platform/text/LocaleICU.cpp:
(WebCore::LocaleICU::LocaleICU):
(WebCore::LocaleICU::~LocaleICU):
(WebCore):
* platform/text/LocaleICU.h:
(LocaleICU):
* platform/text/LocaleWin.cpp:
(WebCore):
* platform/text/LocaleWin.h:
(LocaleWin):
* platform/text/LocalizedNumber.h:
(WebCore):
* platform/text/LocalizedNumberICU.cpp:
(WebCore):
* platform/text/LocalizedNumberNone.cpp:
(WebCore):
* platform/text/Localizer.cpp:
(WebCore):
* platform/text/Localizer.h:
(Localizer):
* platform/text/mac/LocaleMac.h:
(LocaleMac):
* platform/text/mac/LocaleMac.mm:
(WebCore):
* platform/text/mac/LocalizedNumberMac.mm:
(WebCore):
* platform/text/win/LocalizedNumberWin.cpp:
(WebCore):

Source/WebKit/chromium: Rename ENABLE_INPUT_TYPE_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPLE_FIELDS_UI
https://bugs.webkit.org/show_bug.cgi?id=97640

Reviewed by Kent Tamura.

This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature
flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple
fields date/time input UI other than input type "time".

* features.gypi:
* src/LocalizedStrings.cpp:
(WebCore):
* tests/DateTimeFormatTest.cpp:
* tests/LocaleMacTest.cpp:
(LocaleMacTest):
* tests/LocaleWinTest.cpp:
(LocaleWinTest):
* tests/LocalizedDateICUTest.cpp:
* tests/LocalizedNumberICUTest.cpp:

LayoutTests: Rename ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPLE_FIELDS_UI
https://bugs.webkit.org/show_bug.cgi?id=97640

This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature
flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple
fields date/time input UI other than input type "time".

* platfrom/efl/TestExpectations: Update a comment which refers ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS.
* platform/mac/Skipped: ditto.
* platform/qt/Skipped: ditto.
* platform/win/Skipped: ditto.
* platform/wincairo/Skipped: ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129612 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a939d91..27bfb59 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2012-09-26  Yoshifumi Inoue  <yosin@chromium.org>
+
+        Rename ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPLE_FIELDS_UI
+        https://bugs.webkit.org/show_bug.cgi?id=97640
+
+        This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature
+        flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple
+        fields date/time input UI other than input type "time".
+
+        * platfrom/efl/TestExpectations: Update a comment which refers ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS.
+        * platform/mac/Skipped: ditto.
+        * platform/qt/Skipped: ditto.
+        * platform/win/Skipped: ditto.
+        * platform/wincairo/Skipped: ditto.
+
 2012-09-26  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 
         [EFL] Unskip that passes after r125813.

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index 973d804..5928d04 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -1086,7 +1086,7 @@ webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting-fields.html
 webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting.html [ Skip ]
 webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting-instances.html [ Skip ]
 
-# ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) is disabled
+# ENABLE(INPUT_MULTIPLE_FIELDS_UI) is disabled
 webkit.org/b/94186 fast/forms/time-multiple-fields
 
 webkit.org/b/93976 fast/css-generated-content/quotes-lang.html [ ImageOnlyFailure ]

diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 0ff7e43..37d7735 100644 (file)
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -835,7 +835,7 @@ platform/mac/plugins/root-object-premature-delete-crash.html
 # https://bugs.webkit.org/show_bug.cgi?id=92352
 css3/flexbox/flex-rounding.html
 
-# ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) is disabled
+# ENABLE(INPUT_MULTIPLE_FIELDS_UI) is disabled
 fast/forms/time-multiple-fields
 
 # <rdar://problem/11224160> Focus not transferring properly in DumpRenderTree in Mountain Lion

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 22c6a7f..241c0e0 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2742,7 +2742,7 @@ svg/custom/use-instanceRoot-as-event-target.xhtml
 # https://bugs.webkit.org/show_bug.cgi?id=94076
 fast/events/autoscroll-in-textarea.html
 
-# ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) is disabled
+# ENABLE(INPUT_MULTIPLE_FIELDS_UI) is disabled
 fast/forms/time-multiple-fields
 
 # [Qt] New inspector/timeline/timeline-decode-resize.html introduced in r125790 fails

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 39f56e8..381dad7 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1982,7 +1982,7 @@ plugins/nested-plugin-objects.html
 #Require rebaselining after  https://bugs.webkit.org/show_bug.cgi?id=89826
 fast/css/word-space-extra.html
 
-# ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) is disabled
+# ENABLE(INPUT_MULTIPLE_FIELDS_UI) is disabled
 fast/forms/time-multiple-fields
 
 # Require rebaseline after https://bugs.webkit.org/show_bug.cgi?id=84286

diff --git a/LayoutTests/platform/wincairo/Skipped b/LayoutTests/platform/wincairo/Skipped
index ce82673..88159f0 100644 (file)
--- a/LayoutTests/platform/wincairo/Skipped
+++ b/LayoutTests/platform/wincairo/Skipped
@@ -2513,7 +2513,7 @@ plugins/nested-plugin-objects.html
 #Require rebaselining after  https://bugs.webkit.org/show_bug.cgi?id=89826
 fast/css/word-space-extra.html
 
-# ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS) is disabled
+# ENABLE(INPUT_MULTIPLE_FIELDS_UI) is disabled
 fast/forms/time-multiple-fields
 
 # Require rebaseline after https://bugs.webkit.org/show_bug.cgi?id=84286

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3a79c80..00c0afe 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,65 @@
+2012-09-26  Yoshifumi Inoue  <yosin@chromium.org>
+
+        Rename ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPLE_FIELDS_UI
+        https://bugs.webkit.org/show_bug.cgi?id=97640
+
+        This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature
+        flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple
+        fields date/time input UI other than input type "time".
+
+        No new tests. This patch doesn't change behavior.
+
+        * css/html.css:
+        * css/themeWin.css:
+        * html/DateTimeFieldsState.cpp:
+        * html/DateTimeFieldsState.h:
+        * html/TimeInputType.cpp:
+        (WebCore):
+        * html/TimeInputType.h:
+        (TimeInputType):
+        * html/shadow/DateTimeEditElement.cpp:
+        * html/shadow/DateTimeEditElement.h:
+        * html/shadow/DateTimeFieldElement.cpp:
+        * html/shadow/DateTimeFieldElement.h:
+        * html/shadow/DateTimeFieldElements.cpp:
+        * html/shadow/DateTimeFieldElements.h:
+        * html/shadow/DateTimeNumericFieldElement.cpp:
+        * html/shadow/DateTimeNumericFieldElement.h:
+        * html/shadow/DateTimeSymbolicFieldElement.cpp:
+        * html/shadow/DateTimeSymbolicFieldElement.h:
+        * platform/LocalizedStrings.h:
+        (WebCore):
+        * platform/text/DateTimeFormat.cpp:
+        * platform/text/DateTimeFormat.h:
+        * platform/text/LocaleICU.cpp:
+        (WebCore::LocaleICU::LocaleICU):
+        (WebCore::LocaleICU::~LocaleICU):
+        (WebCore):
+        * platform/text/LocaleICU.h:
+        (LocaleICU):
+        * platform/text/LocaleWin.cpp:
+        (WebCore):
+        * platform/text/LocaleWin.h:
+        (LocaleWin):
+        * platform/text/LocalizedNumber.h:
+        (WebCore):
+        * platform/text/LocalizedNumberICU.cpp:
+        (WebCore):
+        * platform/text/LocalizedNumberNone.cpp:
+        (WebCore):
+        * platform/text/Localizer.cpp:
+        (WebCore):
+        * platform/text/Localizer.h:
+        (Localizer):
+        * platform/text/mac/LocaleMac.h:
+        (LocaleMac):
+        * platform/text/mac/LocaleMac.mm:
+        (WebCore):
+        * platform/text/mac/LocalizedNumberMac.mm:
+        (WebCore):
+        * platform/text/win/LocalizedNumberWin.cpp:
+        (WebCore):
+
 2012-09-26  Zan Dobersek  <zandobersek@gmail.com>
 
         [GTK] Enable some of the unstable CSS features

diff --git a/Source/WebCore/css/html.css b/Source/WebCore/css/html.css
index 62d19cb..9a6d810 100644 (file)
--- a/Source/WebCore/css/html.css
+++ b/Source/WebCore/css/html.css
@@ -476,7 +476,7 @@ datalist {
 }
 #endif
 
-#if defined(ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS) && ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS
+#if defined(ENABLE_INPUT_MULTIPLE_FIELDS_UI) && ENABLE_INPUT_MULTIPLE_FIELDS_UI
 input[type="time"] {
     font-family: monospace;
 }

diff --git a/Source/WebCore/css/themeWin.css b/Source/WebCore/css/themeWin.css
index 3dd1cca..0a2e6d1 100644 (file)
--- a/Source/WebCore/css/themeWin.css
+++ b/Source/WebCore/css/themeWin.css
@@ -43,7 +43,7 @@ input[type="number"],
 input[type="password"],
 input[type="tel"],
 input[type="text"],
-#if !defined(ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS) || !ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS
+#if !defined(ENABLE_INPUT_MULTIPLE_FIELDS_UI) || !ENABLE_INPUT_MULTIPLE_FIELDS_UI
 input[type="time"],
 #endif
 input[type="url"],

diff --git a/Source/WebCore/html/DateTimeFieldsState.cpp b/Source/WebCore/html/DateTimeFieldsState.cpp
index 990389d..ae03a13 100644 (file)
--- a/Source/WebCore/html/DateTimeFieldsState.cpp
+++ b/Source/WebCore/html/DateTimeFieldsState.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldsState.h"
 
 #include "FormController.h"

diff --git a/Source/WebCore/html/DateTimeFieldsState.h b/Source/WebCore/html/DateTimeFieldsState.h
index 6fb4440..a924dda 100644 (file)
--- a/Source/WebCore/html/DateTimeFieldsState.h
+++ b/Source/WebCore/html/DateTimeFieldsState.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeFieldsState_h
 #define DateTimeFieldsState_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/html/TimeInputType.cpp b/Source/WebCore/html/TimeInputType.cpp
index a005151..d2d01a8 100644 (file)
--- a/Source/WebCore/html/TimeInputType.cpp
+++ b/Source/WebCore/html/TimeInputType.cpp
@@ -41,7 +41,7 @@
 #include <wtf/PassOwnPtr.h>
 
 #if ENABLE(INPUT_TYPE_TIME)
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldsState.h"
 #include "ElementShadow.h"
 #include "FormController.h"
@@ -118,7 +118,7 @@ bool TimeInputType::isTimeField() const
     return true;
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 TimeInputType::DateTimeEditControlOwnerImpl::DateTimeEditControlOwnerImpl(TimeInputType& timeInputType)
     : m_timeInputType(timeInputType)

diff --git a/Source/WebCore/html/TimeInputType.h b/Source/WebCore/html/TimeInputType.h
index 59e2721..f185054 100644 (file)
--- a/Source/WebCore/html/TimeInputType.h
+++ b/Source/WebCore/html/TimeInputType.h
@@ -35,7 +35,7 @@
 
 #if ENABLE(INPUT_TYPE_TIME)
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeEditElement.h"
 #endif
 
@@ -45,7 +45,7 @@ class TimeInputType : public BaseDateAndTimeInputType {
 public:
     static PassOwnPtr<InputType> create(HTMLInputElement*);
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     virtual ~TimeInputType();
 #endif
 
@@ -59,7 +59,7 @@ private:
     virtual bool setMillisecondToDateComponents(double, DateComponents*) const OVERRIDE;
     virtual bool isTimeField() const OVERRIDE;
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     class DateTimeEditControlOwnerImpl : public DateTimeEditElement::EditControlOwner {
         WTF_MAKE_NONCOPYABLE(DateTimeEditControlOwnerImpl);
 

diff --git a/Source/WebCore/html/shadow/DateTimeEditElement.cpp b/Source/WebCore/html/shadow/DateTimeEditElement.cpp
index 9a0d932..57e5da1 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeEditElement.cpp
+++ b/Source/WebCore/html/shadow/DateTimeEditElement.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeEditElement.h"
 
 #include "DateComponents.h"

diff --git a/Source/WebCore/html/shadow/DateTimeEditElement.h b/Source/WebCore/html/shadow/DateTimeEditElement.h
index 84cf229..91f82b5 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeEditElement.h
+++ b/Source/WebCore/html/shadow/DateTimeEditElement.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeEditElement_h
 #define DateTimeEditElement_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElement.h"
 #include "SpinButtonElement.h"
 #include "StepRange.h"

diff --git a/Source/WebCore/html/shadow/DateTimeFieldElement.cpp b/Source/WebCore/html/shadow/DateTimeFieldElement.cpp
index a0ec51e..0e4b32d 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeFieldElement.cpp
+++ b/Source/WebCore/html/shadow/DateTimeFieldElement.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElement.h"
 
 #include "DateComponents.h"

diff --git a/Source/WebCore/html/shadow/DateTimeFieldElement.h b/Source/WebCore/html/shadow/DateTimeFieldElement.h
index f5c9810..d32ba2d 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeFieldElement.h
+++ b/Source/WebCore/html/shadow/DateTimeFieldElement.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeFieldElement_h
 #define DateTimeFieldElement_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 #include "HTMLDivElement.h"
 

diff --git a/Source/WebCore/html/shadow/DateTimeFieldElements.cpp b/Source/WebCore/html/shadow/DateTimeFieldElements.cpp
index c2f458a..a1fc87a 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeFieldElements.cpp
+++ b/Source/WebCore/html/shadow/DateTimeFieldElements.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElements.h"
 
 #include "DateComponents.h"

diff --git a/Source/WebCore/html/shadow/DateTimeFieldElements.h b/Source/WebCore/html/shadow/DateTimeFieldElements.h
index 23f3403..e14dd13 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeFieldElements.h
+++ b/Source/WebCore/html/shadow/DateTimeFieldElements.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeFieldElements_h
 #define DateTimeFieldElements_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeNumericFieldElement.h"
 #include "DateTimeSymbolicFieldElement.h"
 

diff --git a/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp b/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp
index cf8a4a3..fc1e0db 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp
+++ b/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeNumericFieldElement.h"
 
 #include "KeyboardEvent.h"

diff --git a/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h b/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h
index 28f2b9e..022e03c 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h
+++ b/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeNumericFieldElement_h
 #define DateTimeNumericFieldElement_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElement.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp b/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp
index 6cb4ec1..742208f 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp
+++ b/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeSymbolicFieldElement.h"
 
 #include "FontCache.h"

diff --git a/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h b/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h
index cb0ac1e..f1eab8e 100644 (file)
--- a/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h
+++ b/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeSymbolicFieldElement_h
 #define DateTimeSymbolicFieldElement_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElement.h"
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/LocalizedStrings.h b/Source/WebCore/platform/LocalizedStrings.h
index 39f112b..d269416 100644 (file)
--- a/Source/WebCore/platform/LocalizedStrings.h
+++ b/Source/WebCore/platform/LocalizedStrings.h
@@ -165,7 +165,7 @@ namespace WebCore {
     String AXMenuListPopupActionVerb();
     String AXLinkActionVerb();
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String AXAMPMFieldText();
     String AXDayOfMonthFieldText();
     String AXDateTimeFieldEmptyValueText();

diff --git a/Source/WebCore/platform/text/DateTimeFormat.cpp b/Source/WebCore/platform/text/DateTimeFormat.cpp
index 6de7fdc..d4e5035 100644 (file)
--- a/Source/WebCore/platform/text/DateTimeFormat.cpp
+++ b/Source/WebCore/platform/text/DateTimeFormat.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "DateTimeFormat.h"
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include <wtf/ASCIICType.h>
 #include <wtf/text/StringBuilder.h>
 

diff --git a/Source/WebCore/platform/text/DateTimeFormat.h b/Source/WebCore/platform/text/DateTimeFormat.h
index b7b7402..ec90c6e 100644 (file)
--- a/Source/WebCore/platform/text/DateTimeFormat.h
+++ b/Source/WebCore/platform/text/DateTimeFormat.h
@@ -26,7 +26,7 @@
 #ifndef DateTimeFormat_h
 #define DateTimeFormat_h
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/text/LocaleICU.cpp b/Source/WebCore/platform/text/LocaleICU.cpp
index ae9d1cb..b45500d 100644 (file)
--- a/Source/WebCore/platform/text/LocaleICU.cpp
+++ b/Source/WebCore/platform/text/LocaleICU.cpp
@@ -56,7 +56,7 @@ LocaleICU::LocaleICU(const char* locale)
 #if ENABLE(CALENDAR_PICKER)
     , m_firstDayOfWeek(0)
 #endif
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     , m_mediumTimeFormat(0)
     , m_shortTimeFormat(0)
     , m_didCreateTimeFormat(false)
@@ -68,7 +68,7 @@ LocaleICU::~LocaleICU()
 {
     unum_close(m_numberFormat);
     udat_close(m_shortDateFormat);
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     udat_close(m_mediumTimeFormat);
     udat_close(m_shortTimeFormat);
 #endif
@@ -197,7 +197,7 @@ String LocaleICU::formatLocalizedDate(const DateComponents& dateComponents)
     return String::adopt(buffer);
 }
 
-#if ENABLE(CALENDAR_PICKER) || ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(CALENDAR_PICKER) || ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 static String getDateFormatPattern(const UDateFormat* dateFormat)
 {
     if (!dateFormat)
@@ -375,7 +375,7 @@ unsigned LocaleICU::firstDayOfWeek()
 }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 static PassOwnPtr<Vector<String> > createFallbackAMPMLabels()
 {
     OwnPtr<Vector<String> > labels = adoptPtr(new Vector<String>());

diff --git a/Source/WebCore/platform/text/LocaleICU.h b/Source/WebCore/platform/text/LocaleICU.h
index 1cda89f..d71ddb0 100644 (file)
--- a/Source/WebCore/platform/text/LocaleICU.h
+++ b/Source/WebCore/platform/text/LocaleICU.h
@@ -61,7 +61,7 @@ public:
     unsigned firstDayOfWeek();
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     virtual String timeFormat() OVERRIDE;
     virtual String shortTimeFormat() OVERRIDE;
     virtual const Vector<String>& timeAMPMLabels() OVERRIDE;
@@ -85,11 +85,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 +106,7 @@ private:
     unsigned m_firstDayOfWeek;
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     UDateFormat* m_mediumTimeFormat;
     UDateFormat* m_shortTimeFormat;
     Vector<String> m_timeAMPMLabels;

diff --git a/Source/WebCore/platform/text/LocaleWin.cpp b/Source/WebCore/platform/text/LocaleWin.cpp
index 9925776..a2c3b88 100644 (file)
--- a/Source/WebCore/platform/text/LocaleWin.cpp
+++ b/Source/WebCore/platform/text/LocaleWin.cpp
@@ -32,7 +32,7 @@
 #include "LocaleWin.h"
 
 #include "DateComponents.h"
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFormat.h"
 #endif
 #include "Language.h"
@@ -667,7 +667,7 @@ const Vector<String>& LocaleWin::weekDayShortLabels()
 }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 static DateTimeFormat::FieldType mapCharacterToDateTimeFieldType(UChar ch)
 {
     switch (ch) {

diff --git a/Source/WebCore/platform/text/LocaleWin.h b/Source/WebCore/platform/text/LocaleWin.h
index ab3acd7..2367133 100644 (file)
--- a/Source/WebCore/platform/text/LocaleWin.h
+++ b/Source/WebCore/platform/text/LocaleWin.h
@@ -56,7 +56,7 @@ public:
     unsigned firstDayOfWeek() { return m_firstDayOfWeek; }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     virtual String timeFormat() OVERRIDE;
     virtual String shortTimeFormat() OVERRIDE;
     virtual const Vector<String>& timeAMPMLabels() OVERRIDE;

diff --git a/Source/WebCore/platform/text/LocalizedNumber.h b/Source/WebCore/platform/text/LocalizedNumber.h
index 7a97413..b60f513 100644 (file)
--- a/Source/WebCore/platform/text/LocalizedNumber.h
+++ b/Source/WebCore/platform/text/LocalizedNumber.h
@@ -48,7 +48,7 @@ String convertToLocalizedNumber(const String&);
 // responsible to check the format of the resultant string.
 String convertFromLocalizedNumber(const String&);
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 // Returns localized decimal separator, e.g. "." for English, "," for French.
 String localizedDecimalSeparator();
 #endif

diff --git a/Source/WebCore/platform/text/LocalizedNumberICU.cpp b/Source/WebCore/platform/text/LocalizedNumberICU.cpp
index 17cf7ed..81a5244 100644 (file)
--- a/Source/WebCore/platform/text/LocalizedNumberICU.cpp
+++ b/Source/WebCore/platform/text/LocalizedNumberICU.cpp
@@ -45,7 +45,7 @@ String convertFromLocalizedNumber(const String& localizedNumberString)
     return LocaleICU::currentLocale()->convertFromLocalizedNumber(localizedNumberString);
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 String localizedDecimalSeparator()
 {

diff --git a/Source/WebCore/platform/text/LocalizedNumberNone.cpp b/Source/WebCore/platform/text/LocalizedNumberNone.cpp
index 94855b6..8e6cc85 100644 (file)
--- a/Source/WebCore/platform/text/LocalizedNumberNone.cpp
+++ b/Source/WebCore/platform/text/LocalizedNumberNone.cpp
@@ -47,7 +47,7 @@ String convertFromLocalizedNumber(const String& localizedNumberString)
     return localizedNumberString;
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 UChar localizedDecimalSeparator()
 {

diff --git a/Source/WebCore/platform/text/Localizer.cpp b/Source/WebCore/platform/text/Localizer.cpp
index 8e77257..d2575b2 100644 (file)
--- a/Source/WebCore/platform/text/Localizer.cpp
+++ b/Source/WebCore/platform/text/Localizer.cpp
@@ -184,7 +184,7 @@ String Localizer::convertFromLocalizedNumber(const String& localized)
     return builder.toString();
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 String Localizer::localizedDecimalSeparator()
 {
     initializeLocalizerData();

diff --git a/Source/WebCore/platform/text/Localizer.h b/Source/WebCore/platform/text/Localizer.h
index e56fc40..bb124db 100644 (file)
--- a/Source/WebCore/platform/text/Localizer.h
+++ b/Source/WebCore/platform/text/Localizer.h
@@ -35,7 +35,7 @@ public:
     static PassOwnPtr<Localizer> create(const AtomicString&);
     String convertToLocalizedNumber(const String&);
     String convertFromLocalizedNumber(const String&);
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String localizedDecimalSeparator();
 
     // Returns time format in Unicode TR35 LDML[1] containing hour, minute, and
@@ -61,7 +61,7 @@ protected:
         DecimalSymbolsSize
     };
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String m_localizedTimeFormatText;
     String m_localizedShortTimeFormatText;
     Vector<String> m_timeAMPMLabels;

diff --git a/Source/WebCore/platform/text/mac/LocaleMac.h b/Source/WebCore/platform/text/mac/LocaleMac.h
index 0e48c2e..594a1ee 100644 (file)
--- a/Source/WebCore/platform/text/mac/LocaleMac.h
+++ b/Source/WebCore/platform/text/mac/LocaleMac.h
@@ -60,7 +60,7 @@ public:
     unsigned firstDayOfWeek();
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     virtual String timeFormat() OVERRIDE;
     virtual String shortTimeFormat() OVERRIDE;
     virtual const Vector<String>& timeAMPMLabels() OVERRIDE;
@@ -77,7 +77,7 @@ private:
     Vector<String> m_monthLabels;
     Vector<String> m_weekDayShortLabels;
 #endif
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     NSDateFormatter *createTimeFormatter();
     NSDateFormatter *createShortTimeFormatter();
 

diff --git a/Source/WebCore/platform/text/mac/LocaleMac.mm b/Source/WebCore/platform/text/mac/LocaleMac.mm
index e381c02..68a2dc3 100644 (file)
--- a/Source/WebCore/platform/text/mac/LocaleMac.mm
+++ b/Source/WebCore/platform/text/mac/LocaleMac.mm
@@ -238,7 +238,7 @@ unsigned LocaleMac::firstDayOfWeek()
 }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 NSDateFormatter* LocaleMac::createTimeFormatter()
 {
     return createDateTimeFormatter(m_locale.get(), NSDateFormatterNoStyle, NSDateFormatterMediumStyle);

diff --git a/Source/WebCore/platform/text/mac/LocalizedNumberMac.mm b/Source/WebCore/platform/text/mac/LocalizedNumberMac.mm
index bd6b38a..74828f6 100644 (file)
--- a/Source/WebCore/platform/text/mac/LocalizedNumberMac.mm
+++ b/Source/WebCore/platform/text/mac/LocalizedNumberMac.mm
@@ -45,7 +45,7 @@ String convertFromLocalizedNumber(const String& localizedNumberString)
     return LocaleMac::currentLocale()->convertFromLocalizedNumber(localizedNumberString);
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 String localizedDecimalSeparator()
 {
     return LocaleMac::currentLocale()->localizedDecimalSeparator();

diff --git a/Source/WebCore/platform/text/win/LocalizedNumberWin.cpp b/Source/WebCore/platform/text/win/LocalizedNumberWin.cpp
index a560717..4c56cf6 100644 (file)
--- a/Source/WebCore/platform/text/win/LocalizedNumberWin.cpp
+++ b/Source/WebCore/platform/text/win/LocalizedNumberWin.cpp
@@ -40,7 +40,7 @@ String convertFromLocalizedNumber(const String& localizedNumberString)
     return LocaleWin::currentLocale()->convertFromLocalizedNumber(localizedNumberString);
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 String localizedDecimalSeparator()
 {
     return LocaleWin::currentLocale()->localizedDecimalSeparator();

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 4a3edec..7866197 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,25 @@
+2012-09-26  Yoshifumi Inoue  <yosin@chromium.org>
+
+        Rename ENABLE_INPUT_TYPE_MULTIPLE_FIELDS to ENABLE_INPUT_MULTIPLE_FIELDS_UI
+        https://bugs.webkit.org/show_bug.cgi?id=97640
+
+        Reviewed by Kent Tamura.
+
+        This patch renames ENABLE_INPUT_TYPE_TIME MULTIPLE_FIELDS feature 
+        flag to ENABLE_INPUT_MULTIPLE_FIELDS_UI for implementing multiple 
+        fields date/time input UI other than input type "time".
+
+        * features.gypi:
+        * src/LocalizedStrings.cpp:
+        (WebCore):
+        * tests/DateTimeFormatTest.cpp:
+        * tests/LocaleMacTest.cpp:
+        (LocaleMacTest):
+        * tests/LocaleWinTest.cpp:
+        (LocaleWinTest):
+        * tests/LocalizedDateICUTest.cpp:
+        * tests/LocalizedNumberICUTest.cpp:
+
 2012-09-25  Alpha Lam  <hclam@chromium.org>
 
         Unreviewed. Roll DEPS for Chromium.

diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
index 8b4c40e..8a36532 100644 (file)
--- a/Source/WebKit/chromium/features.gypi
+++ b/Source/WebKit/chromium/features.gypi
@@ -177,7 +177,7 @@
           'ENABLE_DATALIST_ELEMENT=1',
           'ENABLE_INPUT_SPEECH=1',
           'ENABLE_INPUT_TYPE_COLOR=1',
-          'ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS=1',
+          'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
           'ENABLE_JAVASCRIPT_I18N_API=1',
           'ENABLE_LEGACY_NOTIFICATIONS=1',
           'ENABLE_MEDIA_CAPTURE=0',

diff --git a/Source/WebKit/chromium/src/LocalizedStrings.cpp b/Source/WebKit/chromium/src/LocalizedStrings.cpp
index 40a0093..7b6606b 100644 (file)
--- a/Source/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/Source/WebKit/chromium/src/LocalizedStrings.cpp
@@ -202,7 +202,7 @@ String AXMenuListActionVerb()
     return String();
 }
     
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 String AXAMPMFieldText()
 {
     return query(WebLocalizedString::AXAMPMFieldText);

diff --git a/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp b/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp
index 1c006ab..8b99d68 100644 (file)
--- a/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp
+++ b/Source/WebKit/chromium/tests/DateTimeFormatTest.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "DateTimeFormat.h"
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include <gtest/gtest.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>

diff --git a/Source/WebKit/chromium/tests/LocaleMacTest.cpp b/Source/WebKit/chromium/tests/LocaleMacTest.cpp
index afcd0b8..5bb7d21 100644 (file)
--- a/Source/WebKit/chromium/tests/LocaleMacTest.cpp
+++ b/Source/WebKit/chromium/tests/LocaleMacTest.cpp
@@ -100,7 +100,7 @@ protected:
     }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String timeFormat(const String& localeString)
     {
         OwnPtr<LocaleMac> locale = LocaleMac::create(localeString);
@@ -187,7 +187,7 @@ TEST_F(LocaleMacTest, weekDayShortLabels)
 }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 TEST_F(LocaleMacTest, timeFormat)
 {
     EXPECT_STREQ("h:mm:ss a", timeFormat("en_US").utf8().data());

diff --git a/Source/WebKit/chromium/tests/LocaleWinTest.cpp b/Source/WebKit/chromium/tests/LocaleWinTest.cpp
index a3719f0..69ad9a4 100644 (file)
--- a/Source/WebKit/chromium/tests/LocaleWinTest.cpp
+++ b/Source/WebKit/chromium/tests/LocaleWinTest.cpp
@@ -122,7 +122,7 @@ protected:
     }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
     String timeFormat(LCID lcid)
     {
         OwnPtr<LocaleWin> locale = LocaleWin::create(lcid);
@@ -324,7 +324,7 @@ TEST_F(LocaleWinTest, weekDayShortLabels)
 }
 #endif
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 TEST_F(LocaleWinTest, timeFormat)
 {
     EXPECT_STREQ("h:mm:ss a", timeFormat(EnglishUS).utf8().data());

diff --git a/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp b/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp
index 749f910..b79308c 100644 (file)
--- a/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp
+++ b/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 #include "LocaleICU.h"
 #include <gtest/gtest.h>

diff --git a/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp b/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp
index ec7de4e..6facdc1 100644 (file)
--- a/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp
+++ b/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp
@@ -80,7 +80,7 @@ TEST(LocalizedNumberICUTest, Reversible)
     testNumbers("zh_TW");
 }
 
-#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 
 static String testDecimalSeparator(const AtomicString& locale)
 {