Source/web/DateTimeChooserImpl.cpp - Issue 23623017: Prepare for date/time input datalist support

Unified Diff: Source/web/DateTimeChooserImpl.cpp

Issue 23623017: Prepare for date/time input datalist support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/platform/DateTimeChooserClient.h ('K') | « Source/platform/DateTimeChooserClient.h ('k') | Source/web/ExternalDateTimeChooser.h » ('j') | Source/web/WebDateTimeSuggestion.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/web/DateTimeChooserImpl.cpp

diff --git a/Source/web/DateTimeChooserImpl.cpp b/Source/web/DateTimeChooserImpl.cpp

index a8b25aa93b25b56686c2f86d51b19eb05bebf6f1..7eb38ce2039e4e583af7284d0d87400e3b528b77 100644

--- a/Source/web/DateTimeChooserImpl.cpp

+++ b/Source/web/DateTimeChooserImpl.cpp

@@ -85,20 +85,26 @@ WebCore::IntSize DateTimeChooserImpl::contentSize()

return WebCore::IntSize(0, 0);

}

+static String valueToDateTimeString(double value, AtomicString type)

+ WebCore::DateComponents components;

+ if (type == WebCore::InputTypeNames::date())

+ components.setMillisecondsSinceEpochForDate(value);

+ else if (type == WebCore::InputTypeNames::datetimelocal())

+ components.setMillisecondsSinceEpochForDateTimeLocal(value);

+ else if (type == WebCore::InputTypeNames::month())

+ components.setMonthsSinceEpoch(value);

+ else if (type == WebCore::InputTypeNames::time())

+ components.setMillisecondsSinceMidnight(value);

+ else if (type == WebCore::InputTypeNames::week())

+ components.setMillisecondsSinceEpochForWeek(value);

+ else

+ ASSERT_NOT_REACHED();

+ return components.type() == WebCore::DateComponents::Invalid ? String() : components.toString();

void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer)

{

- WebCore::DateComponents minDate;

- WebCore::DateComponents maxDate;

- if (m_parameters.type == WebCore::InputTypeNames::month()) {

- minDate.setMonthsSinceEpoch(m_parameters.minimum);

- maxDate.setMonthsSinceEpoch(m_parameters.maximum);

- } else if (m_parameters.type == WebCore::InputTypeNames::week()) {

- minDate.setMillisecondsSinceEpochForWeek(m_parameters.minimum);

- maxDate.setMillisecondsSinceEpochForWeek(m_parameters.maximum);

- } else {

- minDate.setMillisecondsSinceEpochForDate(m_parameters.minimum);

- maxDate.setMillisecondsSinceEpochForDate(m_parameters.maximum);

- }

String stepString = String::number(m_parameters.step);

String stepBaseString = String::number(m_parameters.stepBase, 11, WTF::TruncateTrailingZeros);

IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_parameters.anchorRectInRootView);

@@ -123,12 +129,12 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer)

addString("</style></head><body><div id=main>Loading...</div><script>\n"

"window.dialogArguments = {\n", writer);

addProperty("anchorRectInScreen", anchorRectInScreen, writer);

- addProperty("min", minDate.toString(), writer);

- addProperty("max", maxDate.toString(), writer);

+ addProperty("min", valueToDateTimeString(m_parameters.minimum, m_parameters.type), writer);

+ addProperty("max", valueToDateTimeString(m_parameters.maximum, m_parameters.type), writer);

addProperty("step", stepString, writer);

addProperty("stepBase", stepBaseString, writer);

addProperty("required", m_parameters.required, writer);

- addProperty("currentValue", m_parameters.currentValue, writer);

+ addProperty("currentValue", valueToDateTimeString(m_parameters.currentValue, m_parameters.type), writer);

addProperty("locale", m_parameters.locale.string(), writer);

addProperty("todayLabel", todayLabelString, writer);

addProperty("clearLabel", locale().queryString(WebLocalizedString::CalendarClear), writer);

@@ -139,11 +145,19 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer)

addProperty("isLocaleRTL", m_locale->isRTL(), writer);

addProperty("isRTL", m_parameters.isAnchorElementRTL, writer);

addProperty("mode", m_parameters.type.string(), writer);

- if (m_parameters.suggestionValues.size()) {

+ if (m_parameters.suggestions.size()) {

+ Vector<String> suggestionValues;

+ Vector<String> localizedSuggestionValues;

+ Vector<String> suggestionLabels;

+ for (unsigned i = 0; i < m_parameters.suggestions.size(); i++) {

tkent 2013/11/07 01:43:10 |i| should be size_t because Vector::size is size_

+ suggestionValues.append(valueToDateTimeString(m_parameters.suggestions[i].value, m_parameters.type));

+ localizedSuggestionValues.append(m_parameters.suggestions[i].localizedValue);

+ suggestionLabels.append(m_parameters.suggestions[i].label);

+ }

+ addProperty("suggestionValues", suggestionValues, writer);

+ addProperty("localizedSuggestionValues", localizedSuggestionValues, writer);

+ addProperty("suggestionLabels", suggestionLabels, writer);

addProperty("inputWidth", static_cast<unsigned>(m_parameters.anchorRectInRootView.width()), writer);

- addProperty("suggestionValues", m_parameters.suggestionValues, writer);

- addProperty("localizedSuggestionValues", m_parameters.localizedSuggestionValues, writer);

- addProperty("suggestionLabels", m_parameters.suggestionLabels, writer);

addProperty("showOtherDateEntry", WebCore::RenderTheme::theme().supportsCalendarPicker(m_parameters.type), writer);

addProperty("otherDateLabel", otherDateLabelString, writer);

addProperty("suggestionHighlightColor", WebCore::RenderTheme::theme().activeListBoxSelectionBackgroundColor().serialized(), writer);

« Source/platform/DateTimeChooserClient.h ('K') | « Source/platform/DateTimeChooserClient.h ('k') | Source/web/ExternalDateTimeChooser.h » ('j') | Source/web/WebDateTimeSuggestion.cpp » ('J')