Title: [132656] trunk/Source/WebCore
- Revision
- 132656
- Author
- [email protected]
- Date
- 2012-10-26 07:58:17 -0700 (Fri, 26 Oct 2012)
Log Message
[Chromium] Build fix for r132650.
https://bugs.webkit.org/show_bug.cgi?id=100482
* platform/text/LocaleWin.cpp:
(WebCore::LocaleWin::timeFormat):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132655 => 132656)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 14:49:20 UTC (rev 132655)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 14:58:17 UTC (rev 132656)
@@ -1,3 +1,11 @@
+2012-10-26 Kent Tamura <[email protected]>
+
+ [Chromium] Build fix for r132650.
+ https://bugs.webkit.org/show_bug.cgi?id=100482
+
+ * platform/text/LocaleWin.cpp:
+ (WebCore::LocaleWin::timeFormat):
+
2012-10-26 Yury Semikhatsky <[email protected]>
[v8] Memory instrumentation: don't count memory of WrapperTypeInfo
Modified: trunk/Source/WebCore/platform/text/LocaleWin.cpp (132655 => 132656)
--- trunk/Source/WebCore/platform/text/LocaleWin.cpp 2012-10-26 14:49:20 UTC (rev 132655)
+++ trunk/Source/WebCore/platform/text/LocaleWin.cpp 2012-10-26 14:58:17 UTC (rev 132656)
@@ -701,7 +701,7 @@
{
if (m_timeFormatWithSeconds.isNull())
m_timeFormatWithSeconds = convertWindowsTimeFormatToLDML(getLocaleInfoString(LOCALE_STIMEFORMAT));
- return m_localizedTimeFormatText;
+ return m_timeFormatWithSeconds;
}
String LocaleWin::shortTimeFormat()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
