Title: [134218] trunk/Source/WebCore
- Revision
- 134218
- Author
- [email protected]
- Date
- 2012-11-12 05:52:07 -0800 (Mon, 12 Nov 2012)
Log Message
Build fix for Chromium Android (caused by r134216)
Unreviewed.
No new tests.
* platform/text/PlatformLocale.cpp:
(WebCore::Locale::formatDateTime):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134217 => 134218)
--- trunk/Source/WebCore/ChangeLog 2012-11-12 13:51:53 UTC (rev 134217)
+++ trunk/Source/WebCore/ChangeLog 2012-11-12 13:52:07 UTC (rev 134218)
@@ -1,3 +1,14 @@
+2012-11-13 Keishi Hattori <[email protected]>
+
+ Build fix for Chromium Android (caused by r134216)
+
+ Unreviewed.
+
+ No new tests.
+
+ * platform/text/PlatformLocale.cpp:
+ (WebCore::Locale::formatDateTime):
+
2012-11-12 Keishi Hattori <[email protected]>
Add support for week/month to Locale::formatDateTime()
Modified: trunk/Source/WebCore/platform/text/PlatformLocale.cpp (134217 => 134218)
--- trunk/Source/WebCore/platform/text/PlatformLocale.cpp 2012-11-12 13:51:53 UTC (rev 134217)
+++ trunk/Source/WebCore/platform/text/PlatformLocale.cpp 2012-11-12 13:52:07 UTC (rev 134218)
@@ -368,6 +368,10 @@
{
if (date.type() == DateComponents::DateTime || date.type() == DateComponents::DateTimeLocal || date.type() == DateComponents::Invalid)
return String();
+#if !ENABLE(INPUT_TYPE_WEEK)
+ if (date.type() == DateComponents::Week)
+ return String();
+#endif
// FIXME: Supports all types.
DateTimeStringBuilder builder(*this, date);
@@ -378,12 +382,14 @@
case DateComponents::Date:
builder.build(dateFormat());
break;
- case DateComponents::Week:
- builder.build(weekFormatInLDML());
- break;
case DateComponents::Month:
builder.build(monthFormat());
break;
+ case DateComponents::Week:
+#if ENABLE(INPUT_TYPE_WEEK)
+ builder.build(weekFormatInLDML());
+ break;
+#endif
case DateComponents::Invalid:
case DateComponents::DateTime:
case DateComponents::DateTimeLocal:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
