<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196861] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196861">196861</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-20 08:42:24 -0800 (Sat, 20 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not require UDate in LocaleICU with !ENABLE_DATE_AND_TIME_INPUT_TYPES
https://bugs.webkit.org/show_bug.cgi?id=154483
Patch by Olivier Blin <olivier.blin@softathome.com> on 2016-02-20
Reviewed by Michael Catanzaro.
Put initializeShortDateFormat(), dateFormat(), m_shortDateFormat and
m_didCreateShortDateFormat under flag, since they are only used by
code under the ENABLE_DATE_AND_TIME_INPUT_TYPES flag.
This helps to build with a light ICU that does not provide UDate
features (with UCONFIG_NO_FORMATTING).
* platform/text/LocaleICU.cpp:
(WebCore::LocaleICU::LocaleICU):
(WebCore::LocaleICU::~LocaleICU):
(WebCore::createFallbackMonthLabels): Deleted.
(WebCore::createFallbackAMPMLabels): Deleted.
* platform/text/LocaleICU.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformtextLocaleICUcpp">trunk/Source/WebCore/platform/text/LocaleICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextLocaleICUh">trunk/Source/WebCore/platform/text/LocaleICU.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196860 => 196861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-20 16:31:28 UTC (rev 196860)
+++ trunk/Source/WebCore/ChangeLog 2016-02-20 16:42:24 UTC (rev 196861)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-02-20 Olivier Blin <olivier.blin@softathome.com>
</span><span class="cx">
</span><ins>+ Do not require UDate in LocaleICU with !ENABLE_DATE_AND_TIME_INPUT_TYPES
+ https://bugs.webkit.org/show_bug.cgi?id=154483
+
+ Reviewed by Michael Catanzaro.
+
+ Put initializeShortDateFormat(), dateFormat(), m_shortDateFormat and
+ m_didCreateShortDateFormat under flag, since they are only used by
+ code under the ENABLE_DATE_AND_TIME_INPUT_TYPES flag.
+
+ This helps to build with a light ICU that does not provide UDate
+ features (with UCONFIG_NO_FORMATTING).
+
+ * platform/text/LocaleICU.cpp:
+ (WebCore::LocaleICU::LocaleICU):
+ (WebCore::LocaleICU::~LocaleICU):
+ (WebCore::createFallbackMonthLabels): Deleted.
+ (WebCore::createFallbackAMPMLabels): Deleted.
+ * platform/text/LocaleICU.h:
+
+2016-02-20 Olivier Blin <olivier.blin@softathome.com>
+
</ins><span class="cx"> Remove declaration of unimplemented methods in LocaleICU
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154482
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextLocaleICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/LocaleICU.cpp (196860 => 196861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/LocaleICU.cpp 2016-02-20 16:31:28 UTC (rev 196860)
+++ trunk/Source/WebCore/platform/text/LocaleICU.cpp 2016-02-20 16:42:24 UTC (rev 196861)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> LocaleICU::LocaleICU(const char* locale)
</span><span class="cx"> : m_locale(locale)
</span><span class="cx"> , m_numberFormat(0)
</span><del>- , m_shortDateFormat(0)
</del><span class="cx"> , m_didCreateDecimalFormat(false)
</span><del>- , m_didCreateShortDateFormat(false)
</del><span class="cx"> #if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</span><ins>+ , m_shortDateFormat(0)
</ins><span class="cx"> , m_mediumTimeFormat(0)
</span><span class="cx"> , m_shortTimeFormat(0)
</span><ins>+ , m_didCreateShortDateFormat(false)
</ins><span class="cx"> , m_didCreateTimeFormat(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> LocaleICU::~LocaleICU()
</span><span class="cx"> {
</span><span class="cx"> unum_close(m_numberFormat);
</span><del>- udat_close(m_shortDateFormat);
</del><span class="cx"> #if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</span><ins>+ udat_close(m_shortDateFormat);
</ins><span class="cx"> udat_close(m_mediumTimeFormat);
</span><span class="cx"> udat_close(m_shortTimeFormat);
</span><span class="cx"> #endif
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> setLocaleData(symbols, decimalTextAttribute(UNUM_POSITIVE_PREFIX), decimalTextAttribute(UNUM_POSITIVE_SUFFIX), decimalTextAttribute(UNUM_NEGATIVE_PREFIX), decimalTextAttribute(UNUM_NEGATIVE_SUFFIX));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</ins><span class="cx"> bool LocaleICU::initializeShortDateFormat()
</span><span class="cx"> {
</span><span class="cx"> if (m_didCreateShortDateFormat)
</span><span class="lines">@@ -146,7 +147,6 @@
</span><span class="cx"> return udat_open(timeStyle, dateStyle, m_locale.data(), gmtTimezone, WTF_ARRAY_LENGTH(gmtTimezone), 0, -1, &status);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</del><span class="cx"> static String getDateFormatPattern(const UDateFormat* dateFormat)
</span><span class="cx"> {
</span><span class="cx"> if (!dateFormat)
</span><span class="lines">@@ -187,9 +187,7 @@
</span><span class="cx"> }
</span><span class="cx"> return WTFMove(labels);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</del><span class="cx"> static std::unique_ptr<Vector<String>> createFallbackMonthLabels()
</span><span class="cx"> {
</span><span class="cx"> auto labels = std::make_unique<Vector<String>>();
</span><span class="lines">@@ -211,9 +209,7 @@
</span><span class="cx"> m_monthLabels = createFallbackMonthLabels();
</span><span class="cx"> return *m_monthLabels;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</del><span class="cx"> static std::unique_ptr<Vector<String>> createFallbackAMPMLabels()
</span><span class="cx"> {
</span><span class="cx"> auto labels = std::make_unique<Vector<String>>();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextLocaleICUh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/LocaleICU.h (196860 => 196861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/LocaleICU.h 2016-02-20 16:31:28 UTC (rev 196860)
+++ trunk/Source/WebCore/platform/text/LocaleICU.h 2016-02-20 16:42:24 UTC (rev 196861)
</span><span class="lines">@@ -68,19 +68,17 @@
</span><span class="cx"> String decimalTextAttribute(UNumberFormatTextAttribute);
</span><span class="cx"> virtual void initializeLocaleData() override;
</span><span class="cx">
</span><ins>+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</ins><span class="cx"> bool initializeShortDateFormat();
</span><span class="cx"> UDateFormat* openDateFormat(UDateFormatStyle timeStyle, UDateFormatStyle dateStyle) const;
</span><span class="cx">
</span><del>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</del><span class="cx"> std::unique_ptr<Vector<String>> createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size);
</span><span class="cx"> void initializeDateTimeFormat();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CString m_locale;
</span><span class="cx"> UNumberFormat* m_numberFormat;
</span><del>- UDateFormat* m_shortDateFormat;
</del><span class="cx"> bool m_didCreateDecimalFormat;
</span><del>- bool m_didCreateShortDateFormat;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</span><span class="cx"> std::unique_ptr<Vector<String>> m_monthLabels;
</span><span class="lines">@@ -91,12 +89,14 @@
</span><span class="cx"> String m_timeFormatWithoutSeconds;
</span><span class="cx"> String m_dateTimeFormatWithSeconds;
</span><span class="cx"> String m_dateTimeFormatWithoutSeconds;
</span><ins>+ UDateFormat* m_shortDateFormat;
</ins><span class="cx"> UDateFormat* m_mediumTimeFormat;
</span><span class="cx"> UDateFormat* m_shortTimeFormat;
</span><span class="cx"> Vector<String> m_shortMonthLabels;
</span><span class="cx"> Vector<String> m_standAloneMonthLabels;
</span><span class="cx"> Vector<String> m_shortStandAloneMonthLabels;
</span><span class="cx"> Vector<String> m_timeAMPMLabels;
</span><ins>+ bool m_didCreateShortDateFormat;
</ins><span class="cx"> bool m_didCreateTimeFormat;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>