Transfer date/time value to chooser as double

content/renderer/renderer_date_time_picker.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_date_time_picker.h"
 
 #include "base/strings/string_util.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/date_time_formatter.h"
 #include "content/renderer/render_view_impl.h"
-
 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h"
 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
 #include "third_party/WebKit/public/web/WebDateTimeInputType.h"
+#include "ui/base/ime/text_input_type.h"
 
 using blink::WebString;
 
 namespace content {
 
+static int GenerateDateTimePickerIdentifier() {
+  static int next = 0;
+  return ++next;
+}
+
+static ui::TextInputType toTextInputType(int type) {
+  if (type >= blink::WebDateTimeInputTypeDate &&
+      type <= blink::WebDateTimeInputTypeWeek) {
+    return static_cast<ui::TextInputType>(type - blink::WebDateTimeInputTypeDate
+                                          + ui::TEXT_INPUT_TYPE_DATE);
+  }
+  NOTREACHED();
+  return ui::TEXT_INPUT_TYPE_NONE;
+}
+
 RendererDateTimePicker::RendererDateTimePicker(
     RenderViewImpl* sender,
     const blink::WebDateTimeChooserParams& params,
     blink::WebDateTimeChooserCompletion* completion)
     : RenderViewObserver(sender),
       chooser_params_(params),
-      chooser_completion_(completion){
+      chooser_completion_(completion),
+      identifier_(GenerateDateTimePickerIdentifier()) {
 }
 
 RendererDateTimePicker::~RendererDateTimePicker() {
 }
 
 bool RendererDateTimePicker::Open() {
-  DateTimeFormatter parser(chooser_params_);
   ViewHostMsg_DateTimeDialogValue_Params message;
-  message.dialog_type = parser.GetType();
-  if (message.dialog_type == ui::TEXT_INPUT_TYPE_WEEK) {
-    message.year = parser.GetWeekYear();
-    message.week = parser.GetWeek();
-  } else {
-    message.year = parser.GetYear();
-    message.month = parser.GetMonth();
-    message.day = parser.GetDay();
-    message.hour = parser.GetHour();
-    message.minute = parser.GetMinute();
-    message.second = parser.GetSecond();
-    message.milli = parser.GetMilli();
-  }
+  message.dialog_type = toTextInputType(chooser_params_.type);
+  message.dialog_value = chooser_params_.doubleValue;
   message.minimum = chooser_params_.minimum;
   message.maximum = chooser_params_.maximum;
   message.step = chooser_params_.step;
-  Send(new ViewHostMsg_OpenDateTimeDialog(routing_id(), message));
+  Send(new ViewHostMsg_OpenDateTimeDialog(routing_id(), identifier_, message));
   return true;
 }
 
 bool RendererDateTimePicker::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RendererDateTimePicker, message)
     IPC_MESSAGE_HANDLER(ViewMsg_ReplaceDateTime, OnReplaceDateTime)
     IPC_MESSAGE_HANDLER(ViewMsg_CancelDateTimeDialog, OnCancel)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void RendererDateTimePicker::OnReplaceDateTime(
-    const ViewHostMsg_DateTimeDialogValue_Params& value) {
-
-  DateTimeFormatter formatter(static_cast<ui::TextInputType>(value.dialog_type),
-                              value.year,
-                              value.month,
-                              value.day,
-                              value.hour,
-                              value.minute,
-                              value.second,
-                              value.milli,
-                              value.year,
-                              value.week);
-
+void RendererDateTimePicker::OnReplaceDateTime(int identifier, double value) {
+  if (identifier != identifier_)

[Miguel Garcia, 2013/11/20 23:05:53]

what is this new identifier thing? It seems very fishy (and not thread safe) to
calculate the identifier should a static method.

[keishi, 2013/11/21 15:03:09]

RendererDateTimePicker::Open() is called by blink so it is always called from
the main thread.
The replaceDateTime and openDateTimeDialog IPC messages can pass each other
during flight, causing the replaceDateTime to be received by a different input
element than the one that opened the dialog. We need an identifier to match them
up.

For example we have an HTML like this. 
This will open two date time dialogs when you tap the body.

<input type=date id=a>
<input type=date id=b>
<script>
a=document.getElementById('a');
b=document.getElementById('b');
document.body.onclick = function() {a.click();b.click(); }
</script>

If the IPC queue is busy something like this could happen.
1. OpenDateTimeDialog is sent for element "a"
2. OpenDateTimeDialog is sent for element "b"
3. OpenDateTimeDialog for element "a" is received by the browser. Dialog opens.
4. User selects date. ReplaceDateTime is sent from the browser to the renderer.
5. OpenDateTimeDialog for element "b" is received by the browser.
6. ReplaceDateTime is received by the renderer. value is set to element b

Therefore it is insufficient to check the type and we should be matching up the
object on the renderer side that triggered the dialog.

+    return;
   if (chooser_completion_)
-    chooser_completion_->didChooseValue(WebString::fromUTF8(
-        formatter.GetFormattedValue().c_str()));
+    chooser_completion_->didChooseValue(value);
 }
 
 void RendererDateTimePicker::OnCancel() {
   if (chooser_completion_)
     chooser_completion_->didCancelChooser();
 }
 
 }  // namespace content