Use MSG.time for WebInputEvent timestamps on Windows

content/browser/renderer_host/input/web_input_event_builders_win.cc

 // Copyright 2013 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/browser/renderer_host/input/web_input_event_builders_win.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 
 using blink::WebInputEvent;
@@ skipping 84 matching lines @@
 
 // Loads the state for toggle keys into the event.
 static void SetToggleKeyState(WebInputEvent* event) {
   // Low bit set from GetKeyState indicates "toggled".
   if (::GetKeyState(VK_NUMLOCK) & 1)
     event->modifiers |= WebInputEvent::NumLockOn;
   if (::GetKeyState(VK_CAPITAL) & 1)
     event->modifiers |= WebInputEvent::CapsLockOn;
 }
 
-WebKeyboardEvent WebKeyboardEventBuilder::Build(HWND hwnd, UINT message,
-                                                WPARAM wparam, LPARAM lparam) {
+WebKeyboardEvent WebKeyboardEventBuilder::Build(HWND hwnd,
+                                                UINT message,
+                                                WPARAM wparam,
+                                                LPARAM lparam,
+                                                DWORD time_ms) {
   WebKeyboardEvent result;
 
-  // TODO(pkasting): http://b/1117926 Are we guaranteed that the message that
-  // GetMessageTime() refers to is the same one that we're passed in? Perhaps
-  // one of the construction parameters should be the time passed by the
-  // caller, who would know for sure.
-  result.timeStampSeconds = ::GetMessageTime() / 1000.0;
+  DCHECK(time_ms);
+  result.timeStampSeconds = time_ms / 1000.0;
 
   result.windowsKeyCode = static_cast<int>(wparam);
   // Record the scan code (along with other context bits) for this key event.
   result.nativeKeyCode = static_cast<int>(lparam);
 
   switch (message) {
   case WM_SYSKEYDOWN:
     result.isSystemKey = true;
   case WM_KEYDOWN:
     result.type = WebInputEvent::RawKeyDown;
@@ skipping 50 matching lines @@
 static int g_last_click_count = 0;
 static double g_last_click_time = 0;
 
 static LPARAM GetRelativeCursorPos(HWND hwnd) {
   POINT pos = {-1, -1};
   GetCursorPos(&pos);
   ScreenToClient(hwnd, &pos);
   return MAKELPARAM(pos.x, pos.y);
 }
 
-WebMouseEvent WebMouseEventBuilder::Build(HWND hwnd, UINT message,
-                                          WPARAM wparam, LPARAM lparam) {
+WebMouseEvent WebMouseEventBuilder::Build(HWND hwnd,
+                                          UINT message,
+                                          WPARAM wparam,
+                                          LPARAM lparam,
+                                          DWORD time_ms) {
   WebMouseEvent result;
 
   switch (message) {
   case WM_MOUSEMOVE:
     result.type = WebInputEvent::MouseMove;
     if (wparam & MK_LBUTTON)
       result.button = WebMouseEvent::ButtonLeft;
     else if (wparam & MK_MBUTTON)
       result.button = WebMouseEvent::ButtonMiddle;
     else if (wparam & MK_RBUTTON)
@@ skipping 32 matching lines @@
     result.button = WebMouseEvent::ButtonMiddle;
     break;
   case WM_RBUTTONUP:
     result.type = WebInputEvent::MouseUp;
     result.button = WebMouseEvent::ButtonRight;
     break;
   default:
     NOTREACHED();
   }
 
-  // TODO(pkasting): http://b/1117926 Are we guaranteed that the message that
-  // GetMessageTime() refers to is the same one that we're passed in? Perhaps
-  // one of the construction parameters should be the time passed by the
-  // caller, who would know for sure.
-  result.timeStampSeconds = ::GetMessageTime() / 1000.0;
+  DCHECK(time_ms);
+  result.timeStampSeconds = time_ms / 1000.0;
 
   // set position fields:
 
   result.x = static_cast<short>(LOWORD(lparam));
   result.y = static_cast<short>(HIWORD(lparam));
   result.windowX = result.x;
   result.windowY = result.y;
 
   POINT global_point = { result.x, result.y };
   ClientToScreen(hwnd, &global_point);
@@ skipping 52 matching lines @@
     result.modifiers |= WebInputEvent::MiddleButtonDown;
   if (wparam & MK_RBUTTON)
     result.modifiers |= WebInputEvent::RightButtonDown;
 
   SetToggleKeyState(&result);
   return result;
 }
 
 // WebMouseWheelEvent ---------------------------------------------------------
 
-WebMouseWheelEvent
-WebMouseWheelEventBuilder::Build(HWND hwnd, UINT message,
-                                 WPARAM wparam, LPARAM lparam) {
+WebMouseWheelEvent WebMouseWheelEventBuilder::Build(HWND hwnd,
+                                                    UINT message,
+                                                    WPARAM wparam,
+                                                    LPARAM lparam,
+                                                    DWORD time_ms) {
   WebMouseWheelEvent result;
 
   result.type = WebInputEvent::MouseWheel;
 
-  // TODO(pkasting): http://b/1117926 Are we guaranteed that the message that
-  // GetMessageTime() refers to is the same one that we're passed in? Perhaps
-  // one of the construction parameters should be the time passed by the
-  // caller, who would know for sure.
-  result.timeStampSeconds = ::GetMessageTime() / 1000.0;
+  DCHECK(time_ms);
+  result.timeStampSeconds = time_ms / 1000.0;
 
   result.button = WebMouseEvent::ButtonNone;
 
   // Get key state, coordinates, and wheel delta from event.
   typedef SHORT (WINAPI *GetKeyStateFunction)(int key);
   GetKeyStateFunction get_key_state_func;
   UINT key_state;
   float wheel_delta;
   bool horizontal_scroll = false;
   if ((message == WM_VSCROLL) || (message == WM_HSCROLL)) {
@@ skipping 116 matching lines @@
     result.wheelTicksX = wheel_delta;
   } else {
     result.deltaY = scroll_delta;
     result.wheelTicksY = wheel_delta;
   }
 
   return result;
 }
 
 }  // namespace content