Title: [147869] trunk/Source/WebCore
- Revision
- 147869
- Author
- [email protected]
- Date
- 2013-04-07 11:30:17 -0700 (Sun, 07 Apr 2013)
Log Message
Fix compilation of LocaleWin with !ENABLE(CALENDAR_PICKER) && !ENABLE(DATE_AND_TIME_INPUT_TYPES)
* platform/text/win/LocaleWin.cpp:
(WebCore::LocaleWin::ensureShortMonthLabels):
(WebCore):
(WebCore::LocaleWin::ensureMonthLabels):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147868 => 147869)
--- trunk/Source/WebCore/ChangeLog 2013-04-07 17:07:54 UTC (rev 147868)
+++ trunk/Source/WebCore/ChangeLog 2013-04-07 18:30:17 UTC (rev 147869)
@@ -1,5 +1,14 @@
2013-04-07 Patrick Gansterer <[email protected]>
+ Fix compilation of LocaleWin with !ENABLE(CALENDAR_PICKER) && !ENABLE(DATE_AND_TIME_INPUT_TYPES)
+
+ * platform/text/win/LocaleWin.cpp:
+ (WebCore::LocaleWin::ensureShortMonthLabels):
+ (WebCore):
+ (WebCore::LocaleWin::ensureMonthLabels):
+
+2013-04-07 Patrick Gansterer <[email protected]>
+
[WIN] Fix build without precompiled header after r144216.
* platform/network/cf/FormDataStreamCFNet.h:
Modified: trunk/Source/WebCore/platform/text/win/LocaleWin.cpp (147868 => 147869)
--- trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2013-04-07 17:07:54 UTC (rev 147868)
+++ trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2013-04-07 18:30:17 UTC (rev 147869)
@@ -192,6 +192,7 @@
void LocaleWin::ensureShortMonthLabels()
{
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
if (!m_shortMonthLabels.isEmpty())
return;
const LCTYPE types[12] = {
@@ -219,10 +220,12 @@
return;
}
}
+#endif
}
// -------------------------------- Tokenized date format
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
static unsigned countContinuousLetters(const String& format, unsigned index)
{
unsigned count = 1;
@@ -320,9 +323,11 @@
commitLiteralToken(literalBuffer, converted);
return converted.toString();
}
+#endif
void LocaleWin::ensureMonthLabels()
{
+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
if (!m_monthLabels.isEmpty())
return;
const LCTYPE types[12] = {
@@ -350,8 +355,10 @@
return;
}
}
+#endif
}
+#if ENABLE(CALENDAR_PICKER)
void LocaleWin::ensureWeekDayShortLabels()
{
if (!m_weekDayShortLabels.isEmpty())
@@ -379,6 +386,7 @@
}
}
}
+#endif
#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
const Vector<String>& LocaleWin::monthLabels()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
