Refactor WebInputEventAura to ui/events/blink

ui/events/blink/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 "ui/events/blink/web_input_event_builders_win.h"
 
-#include "base/logging.h"
-#include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event_utils.h"
 
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 
-namespace content {
+namespace ui {
 
 static const unsigned long kDefaultScrollLinesPerWheelDelta = 3;
 static const unsigned long kDefaultScrollCharsPerWheelDelta = 1;
 
 WebKeyboardEvent WebKeyboardEventBuilder::Build(HWND hwnd,
                                                 UINT message,
                                                 WPARAM wparam,
                                                 LPARAM lparam,
                                                 double time_stamp) {
   WebKeyboardEvent result;
 
   result.timeStampSeconds = time_stamp;
 
   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;
-    break;
-  case WM_SYSKEYUP:
-    result.isSystemKey = true;
-  case WM_KEYUP:
-    result.type = WebInputEvent::KeyUp;
-    break;
-  case WM_IME_CHAR:
-    result.type = WebInputEvent::Char;
-    break;
-  case WM_SYSCHAR:
-    result.isSystemKey = true;
-    result.type = WebInputEvent::Char;
-  case WM_CHAR:
-    result.type = WebInputEvent::Char;
-    break;
-  default:
-    NOTREACHED();
+    case WM_SYSKEYDOWN:
+      result.isSystemKey = true;
+    case WM_KEYDOWN:

[sadrul, 2016/08/15 15:55:13]

Add a '// fallthrough' comment here.

[jonross, 2016/08/16 15:25:16]

Done.

+      result.type = WebInputEvent::RawKeyDown;
+      break;
+    case WM_SYSKEYUP:
+      result.isSystemKey = true;

[sadrul, 2016/08/15 15:55:13]

ditto

[jonross, 2016/08/16 15:25:16]

Done.

+    case WM_KEYUP:
+      result.type = WebInputEvent::KeyUp;
+      break;
+    case WM_IME_CHAR:
+      result.type = WebInputEvent::Char;
+      break;
+    case WM_SYSCHAR:
+      result.isSystemKey = true;
+      result.type = WebInputEvent::Char;

[sadrul, 2016/08/15 15:55:13]

Remove this, add a // fallthrough comment.

[jonross, 2016/08/16 15:25:16]

Done.

+    case WM_CHAR:
+      result.type = WebInputEvent::Char;
+      break;
+    default:
+      NOTREACHED();
   }
 
-  if (result.type == WebInputEvent::Char
-   || result.type == WebInputEvent::RawKeyDown) {
+  if (result.type == WebInputEvent::Char ||
+      result.type == WebInputEvent::RawKeyDown) {
     result.text[0] = result.windowsKeyCode;
     result.unmodifiedText[0] = result.windowsKeyCode;
   }
   result.modifiers =
       ui::EventFlagsToWebEventModifiers(ui::GetModifiersFromKeyState());
   // NOTE: There doesn't seem to be a way to query the mouse button state in
   // this case.
 
   // Bit 30 of lParam represents the "previous key state". If set, the key was
   // already down, therefore this is an auto-repeat. Only apply this to key
@@ skipping 19 matching lines @@
 WebMouseEvent WebMouseEventBuilder::Build(
     HWND hwnd,
     UINT message,
     WPARAM wparam,
     LPARAM lparam,
     double time_stamp,
     blink::WebPointerProperties::PointerType pointer_type) {
   WebMouseEvent result;
 
   switch (message) {
-  case WM_MOUSEMOVE:
-    result.type = WebInputEvent::MouseMove;
-    if (wparam & MK_LBUTTON)
+    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)
+        result.button = WebMouseEvent::ButtonRight;
+      else
+        result.button = WebMouseEvent::ButtonNone;
+      break;
+    case WM_MOUSELEAVE:
+    case WM_NCMOUSELEAVE:
+      // TODO(rbyers): This should be MouseLeave but is disabled temporarily.
+      // See http://crbug.com/450631
+      result.type = WebInputEvent::MouseMove;
+      result.button = WebMouseEvent::ButtonNone;
+      // set the current mouse position (relative to the client area of the
+      // current window) since none is specified for this event
+      lparam = GetRelativeCursorPos(hwnd);
+      break;
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONDBLCLK:
+      result.type = WebInputEvent::MouseDown;
       result.button = WebMouseEvent::ButtonLeft;
-    else if (wparam & MK_MBUTTON)
+      break;
+    case WM_MBUTTONDOWN:
+    case WM_MBUTTONDBLCLK:
+      result.type = WebInputEvent::MouseDown;
       result.button = WebMouseEvent::ButtonMiddle;
-    else if (wparam & MK_RBUTTON)
+      break;
+    case WM_RBUTTONDOWN:
+    case WM_RBUTTONDBLCLK:
+      result.type = WebInputEvent::MouseDown;
       result.button = WebMouseEvent::ButtonRight;
-    else
-      result.button = WebMouseEvent::ButtonNone;
-    break;
-  case WM_MOUSELEAVE:
-  case WM_NCMOUSELEAVE:
-    // TODO(rbyers): This should be MouseLeave but is disabled temporarily.
-    // See http://crbug.com/450631
-    result.type = WebInputEvent::MouseMove;
-    result.button = WebMouseEvent::ButtonNone;
-    // set the current mouse position (relative to the client area of the
-    // current window) since none is specified for this event
-    lparam = GetRelativeCursorPos(hwnd);
-    break;
-  case WM_LBUTTONDOWN:
-  case WM_LBUTTONDBLCLK:
-    result.type = WebInputEvent::MouseDown;
-    result.button = WebMouseEvent::ButtonLeft;
-    break;
-  case WM_MBUTTONDOWN:
-  case WM_MBUTTONDBLCLK:
-    result.type = WebInputEvent::MouseDown;
-    result.button = WebMouseEvent::ButtonMiddle;
-    break;
-  case WM_RBUTTONDOWN:
-  case WM_RBUTTONDBLCLK:
-    result.type = WebInputEvent::MouseDown;
-    result.button = WebMouseEvent::ButtonRight;
-    break;
-  case WM_LBUTTONUP:
-    result.type = WebInputEvent::MouseUp;
-    result.button = WebMouseEvent::ButtonLeft;
-    break;
-  case WM_MBUTTONUP:
-    result.type = WebInputEvent::MouseUp;
-    result.button = WebMouseEvent::ButtonMiddle;
-    break;
-  case WM_RBUTTONUP:
-    result.type = WebInputEvent::MouseUp;
-    result.button = WebMouseEvent::ButtonRight;
-    break;
-  default:
-    NOTREACHED();
+      break;
+    case WM_LBUTTONUP:
+      result.type = WebInputEvent::MouseUp;
+      result.button = WebMouseEvent::ButtonLeft;
+      break;
+    case WM_MBUTTONUP:
+      result.type = WebInputEvent::MouseUp;
+      result.button = WebMouseEvent::ButtonMiddle;
+      break;
+    case WM_RBUTTONUP:
+      result.type = WebInputEvent::MouseUp;
+      result.button = WebMouseEvent::ButtonRight;
+      break;
+    default:
+      NOTREACHED();
   }
 
   result.timeStampSeconds = time_stamp;
   result.pointerType = pointer_type;
 
   // 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 };
+  POINT global_point = {result.x, result.y};
   ClientToScreen(hwnd, &global_point);
 
   // We need to convert the global point back to DIP before using it.
   gfx::Point dip_global_point = display::win::ScreenWin::ScreenToDIPPoint(
       gfx::Point(global_point.x, global_point.y));
 
   result.globalX = dip_global_point.x();
   result.globalY = dip_global_point.y();
 
   // calculate number of clicks:
 
   // This differs slightly from the WebKit code in WebKit/win/WebView.cpp
   // where their original code looks buggy.
   static int last_click_position_x;
   static int last_click_position_y;
   static WebMouseEvent::Button last_click_button = WebMouseEvent::ButtonLeft;
 
   double current_time = result.timeStampSeconds;
   bool cancel_previous_click =
       (abs(last_click_position_x - result.x) >
-          (::GetSystemMetrics(SM_CXDOUBLECLK) / 2))
-      || (abs(last_click_position_y - result.y) >
-          (::GetSystemMetrics(SM_CYDOUBLECLK) / 2))
-      || ((current_time - g_last_click_time) * 1000.0 > ::GetDoubleClickTime());
+       (::GetSystemMetrics(SM_CXDOUBLECLK) / 2)) ||
+      (abs(last_click_position_y - result.y) >
+       (::GetSystemMetrics(SM_CYDOUBLECLK) / 2)) ||
+      ((current_time - g_last_click_time) * 1000.0 > ::GetDoubleClickTime());
 
   if (result.type == WebInputEvent::MouseDown) {
     if (!cancel_previous_click && (result.button == last_click_button)) {
       ++g_last_click_count;
     } else {
       g_last_click_count = 1;
       last_click_position_x = result.x;
       last_click_position_y = result.y;
     }
     g_last_click_time = current_time;
     last_click_button = result.button;
-  } else if (result.type == WebInputEvent::MouseMove
-          || result.type == WebInputEvent::MouseLeave) {
+  } else if (result.type == WebInputEvent::MouseMove ||
+             result.type == WebInputEvent::MouseLeave) {
     if (cancel_previous_click) {
       g_last_click_count = 0;
       last_click_position_x = 0;
       last_click_position_y = 0;
       g_last_click_time = 0;
     }
   }
   result.clickCount = g_last_click_count;
 
   // set modifiers:
@@ skipping 47 matching lines @@
       key_state |= MK_CONTROL;
     // NOTE: There doesn't seem to be a way to query the mouse button state
     // in this case.
 
     POINT cursor_position = {0};
     GetCursorPos(&cursor_position);
     result.globalX = cursor_position.x;
     result.globalY = cursor_position.y;
 
     switch (LOWORD(wparam)) {
-      case SB_LINEUP:    // == SB_LINELEFT
+      case SB_LINEUP:  // == SB_LINELEFT
         wheel_delta = WHEEL_DELTA;
         break;
       case SB_LINEDOWN:  // == SB_LINERIGHT
         wheel_delta = -WHEEL_DELTA;
         break;
       case SB_PAGEUP:
         wheel_delta = 1;
         result.scrollByPage = true;
         break;
       case SB_PAGEDOWN:
@@ skipping 35 matching lines @@
   if (key_state & MK_CONTROL)
     result.modifiers |= WebInputEvent::ControlKey;
   if (key_state & MK_LBUTTON)
     result.modifiers |= WebInputEvent::LeftButtonDown;
   if (key_state & MK_MBUTTON)
     result.modifiers |= WebInputEvent::MiddleButtonDown;
   if (key_state & MK_RBUTTON)
     result.modifiers |= WebInputEvent::RightButtonDown;
 
   // Set coordinates by translating event coordinates from screen to client.
-  POINT client_point = { result.globalX, result.globalY };
+  POINT client_point = {result.globalX, result.globalY};
   MapWindowPoints(0, hwnd, &client_point, 1);
   result.x = client_point.x;
   result.y = client_point.y;
   result.windowX = result.x;
   result.windowY = result.y;
 
   // Convert wheel delta amount to a number of pixels to scroll.
   //
   // How many pixels should we scroll per line?  Gecko uses the height of the
   // current line, which means scroll distance changes as you go through the
@@ skipping 31 matching lines @@
     result.deltaX = scroll_delta;
     result.wheelTicksX = wheel_delta;
   } else {
     result.deltaY = scroll_delta;
     result.wheelTicksY = wheel_delta;
   }
 
   return result;
 }
 
-}  // namespace content
+}  // namespace ui