diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
| commit | dc6262b587c71c14e30d93e57ed812e36a79a33e (patch) | |
| tree | 03ff986e7aa38bba0c0ef374f44fda52aff93f01 /Source/WebKit/chromium/src/DateTimeChooserImpl.cpp | |
| parent | 02e1fbbefd49229b102ef107bd70ce974a2d85fb (diff) | |
| download | qtwebkit-dc6262b587c71c14e30d93e57ed812e36a79a33e.tar.gz | |
Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343)
New snapshot with build fixes for latest qtbase
Diffstat (limited to 'Source/WebKit/chromium/src/DateTimeChooserImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/DateTimeChooserImpl.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp b/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp index 69718dcb6..4e2c69e9f 100644 --- a/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp +++ b/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp @@ -37,6 +37,7 @@ #include "ChromeClientImpl.h" #include "DateComponents.h" #include "DateTimeChooserClient.h" +#include "InputTypeNames.h" #include "Language.h" #include "LocalizedDate.h" #include "NotImplemented.h" @@ -87,6 +88,7 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer) addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", writer); writer.addData(WebCore::pickerCommonCss, sizeof(WebCore::pickerCommonCss)); + writer.addData(WebCore::suggestionPickerCss, sizeof(WebCore::suggestionPickerCss)); writer.addData(WebCore::calendarPickerCss, sizeof(WebCore::calendarPickerCss)); CString extraStyle = WebCore::RenderTheme::defaultTheme()->extraCalendarPickerStyleSheet(); if (extraStyle.length()) @@ -106,9 +108,20 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer) addProperty("dayLabels", WebCore::weekDayShortLabels(), writer); Direction dir = direction(WebCore::monthLabels()[0][0]); addProperty("isRTL", dir == RightToLeft || dir == RightToLeftArabic, writer); + if (m_parameters.suggestionValues.size()) { + 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", m_parameters.type == WebCore::InputTypeNames::date(), writer); + addProperty("otherDateLabel", Platform::current()->queryLocalizedString(WebLocalizedString::OtherDateLabel), writer); + addProperty("suggestionHighlightColor", WebCore::RenderTheme::defaultTheme()->activeListBoxSelectionBackgroundColor().serialized(), writer); + addProperty("suggestionHighlightTextColor", WebCore::RenderTheme::defaultTheme()->activeListBoxSelectionForegroundColor().serialized(), writer); + } addString("}\n", writer); writer.addData(WebCore::pickerCommonJs, sizeof(WebCore::pickerCommonJs)); + writer.addData(WebCore::suggestionPickerJs, sizeof(WebCore::suggestionPickerJs)); writer.addData(WebCore::calendarPickerJs, sizeof(WebCore::calendarPickerJs)); addString("</script></body>\n", writer); } |