Import GTK WebInputEvent factory to content

(Migrated from crrev.com/21133002)

This imports the GTK WebInputEvent factory into content as
a set of WebInputEventBuilders. The functionality should be exacly the
same except for the handling of the following keycodes which changed due
to moving from the WebCore GDK -> windows keycode mapping to ui/base:

0xD7 (XK_multiply) is mapped to 0xA6 (VKEY_MULTIPLY) instead of 0
(VKEY_UKNOWN).
0xA6 (XK_brokenbar), 0xAB (XK_guillemotleft), 0xB0 (XK_degree),
0xBB (XK_guillemotright), 0xD9 (XK_Ugrave) and 0xF9 (XK_ugrave)
map to 0xE2 (VKEY_OEM_102) instead of 0 (VKEY_UNKNOWN).

I think these are progressions.

BUG=263189

Review URL: https://chromiumcodereview.appspot.com/23815005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223533 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/DEPS

@@ -57,7 +57,6 @@ include_rules = [
   "+third_party/WebKit/public/web/WebTextDirection.h",
 
   # These should be burned down. http://crbug.com/237267
-  "!third_party/WebKit/public/web/gtk/WebInputEventFactory.h",
   "!third_party/WebKit/public/web/mac/WebInputEventFactory.h",
 
   # DO NOT ADD ANY CHROME OR COMPONENTS INCLUDES HERE!!!

content/browser/renderer_host/input/web_input_event_builders_gtk.h

+// 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.
+
+#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_WEB_INPUT_EVENT_BUILDERS_GTK_H_
+#define CONTENT_BROWSER_RENDERER_HOST_INPUT_WEB_INPUT_EVENT_BUILDERS_GTK_H_
+
+#include "content/common/content_export.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/base/keycodes/keyboard_codes.h"
+
+typedef struct _GdkEventButton GdkEventButton;
+typedef struct _GdkEventMotion GdkEventMotion;
+typedef struct _GdkEventCrossing GdkEventCrossing;
+typedef struct _GdkEventScroll GdkEventScroll;
+typedef struct _GdkEventKey GdkEventKey;
+
+namespace content {
+
+class CONTENT_EXPORT WebKeyboardEventBuilder {
+ public:
+  static WebKit::WebKeyboardEvent Build(const GdkEventKey* event);
+  static WebKit::WebKeyboardEvent Build(wchar_t character,
+                                        int state,
+                                        double time_secs);
+};
+
+class CONTENT_EXPORT WebMouseEventBuilder {
+ public:
+  static WebKit::WebMouseEvent Build(const GdkEventButton* event);
+  static WebKit::WebMouseEvent Build(const GdkEventMotion* event);
+  static WebKit::WebMouseEvent Build(const GdkEventCrossing* event);
+};
+
+class CONTENT_EXPORT WebMouseWheelEventBuilder {
+ public:
+  static float ScrollbarPixelsPerTick();
+  static WebKit::WebMouseWheelEvent Build(
+      const GdkEventScroll* event);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_WEB_INPUT_EVENT_BUILDERS_GTK_H

content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.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_gtk.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+
+using WebKit::WebInputEvent;
+using WebKit::WebKeyboardEvent;
+using WebKit::WebMouseEvent;
+using content::WebMouseEventBuilder;
+using content::WebKeyboardEventBuilder;
+
+namespace {
+
+TEST(WebMouseEventBuilderTest, DoubleClick) {
+  GdkEventButton first_click;
+  first_click.type = GDK_BUTTON_PRESS;
+  first_click.window = static_cast<GdkWindow*>(GINT_TO_POINTER(1));
+  first_click.x = first_click.y = first_click.x_root = first_click.y_root = 100;
+  first_click.state = 0;
+  first_click.time = 0;
+  first_click.button = 1;
+
+  // Single click works.
+  WebMouseEvent first_click_events =
+      WebMouseEventBuilder::Build(&first_click);
+  EXPECT_EQ(1, first_click_events.clickCount);
+
+  // Make sure double click works.
+  GdkEventButton second_click = first_click;
+  second_click.time = first_click.time + 100;
+  WebMouseEvent second_click_events =
+      WebMouseEventBuilder::Build(&second_click);
+  EXPECT_EQ(2, second_click_events.clickCount);
+
+  // Reset the click count.
+  first_click.time += 10000;
+  first_click_events = WebMouseEventBuilder::Build(&first_click);
+  EXPECT_EQ(1, first_click_events.clickCount);
+
+  // Two clicks with a long gap in between aren't counted as a double click.
+  second_click = first_click;
+  second_click.time = first_click.time + 1000;
+  second_click_events = WebMouseEventBuilder::Build(&second_click);
+  EXPECT_EQ(1, second_click_events.clickCount);
+
+  // Reset the click count.
+  first_click.time += 10000;
+  first_click_events = WebMouseEventBuilder::Build(&first_click);
+  EXPECT_EQ(1, first_click_events.clickCount);
+
+  // Two clicks far apart (horizontally) aren't counted as a double click.
+  second_click = first_click;
+  second_click.time = first_click.time + 1;
+  second_click.x = first_click.x + 100;
+  second_click_events = WebMouseEventBuilder::Build(&second_click);
+  EXPECT_EQ(1, second_click_events.clickCount);
+
+  // Reset the click count.
+  first_click.time += 10000;
+  first_click_events = WebMouseEventBuilder::Build(&first_click);
+  EXPECT_EQ(1, first_click_events.clickCount);
+
+  // Two clicks far apart (vertically) aren't counted as a double click.
+  second_click = first_click;
+  second_click.time = first_click.time + 1;
+  second_click.x = first_click.y + 100;
+  second_click_events = WebMouseEventBuilder::Build(&second_click);
+  EXPECT_EQ(1, second_click_events.clickCount);
+
+  // Reset the click count.
+  first_click.time += 10000;
+  first_click_events = WebMouseEventBuilder::Build(&first_click);
+  EXPECT_EQ(1, first_click_events.clickCount);
+
+  // Two clicks on different windows aren't a double click.
+  second_click = first_click;
+  second_click.time = first_click.time + 1;
+  second_click.window = static_cast<GdkWindow*>(GINT_TO_POINTER(2));
+  second_click_events = WebMouseEventBuilder::Build(&second_click);
+  EXPECT_EQ(1, second_click_events.clickCount);
+}
+
+TEST(WebMouseEventBuilderTest, MouseUpClickCount) {
+  GdkEventButton mouse_down;
+  memset(&mouse_down, 0, sizeof(mouse_down));
+  mouse_down.type = GDK_BUTTON_PRESS;
+  mouse_down.window = static_cast<GdkWindow*>(GINT_TO_POINTER(1));
+  mouse_down.x = mouse_down.y = mouse_down.x_root = mouse_down.y_root = 100;
+  mouse_down.time = 0;
+  mouse_down.button = 1;
+
+  // Properly set the last click time, so that the internal state won't be
+  // affected by previous tests.
+  WebMouseEventBuilder::Build(&mouse_down);
+
+  mouse_down.time += 10000;
+  GdkEventButton mouse_up = mouse_down;
+  mouse_up.type = GDK_BUTTON_RELEASE;
+  WebMouseEvent mouse_down_event;
+  WebMouseEvent mouse_up_event;
+
+  // Click for three times.
+  for (int i = 1; i < 4; ++i) {
+    mouse_down.time += 100;
+    mouse_down_event = WebMouseEventBuilder::Build(&mouse_down);
+    EXPECT_EQ(i, mouse_down_event.clickCount);
+
+    mouse_up.time = mouse_down.time + 50;
+    mouse_up_event = WebMouseEventBuilder::Build(&mouse_up);
+    EXPECT_EQ(i, mouse_up_event.clickCount);
+  }
+
+  // Reset the click count.
+  mouse_down.time += 10000;
+  mouse_down_event = WebMouseEventBuilder::Build(&mouse_down);
+  EXPECT_EQ(1, mouse_down_event.clickCount);
+
+  // Moving the cursor for a significant distance will reset the click count to
+  // 0.
+  GdkEventMotion mouse_move;
+  memset(&mouse_move, 0, sizeof(mouse_move));
+  mouse_move.type = GDK_MOTION_NOTIFY;
+  mouse_move.window = mouse_down.window;
+  mouse_move.time = mouse_down.time;
+  mouse_move.x = mouse_move.y = mouse_move.x_root = mouse_move.y_root =
+      mouse_down.x + 100;
+  WebMouseEventBuilder::Build(&mouse_move);
+
+  mouse_up.time = mouse_down.time + 50;
+  mouse_up_event = WebMouseEventBuilder::Build(&mouse_up);
+  EXPECT_EQ(0, mouse_up_event.clickCount);
+
+  // Reset the click count.
+  mouse_down.time += 10000;
+  mouse_down_event = WebMouseEventBuilder::Build(&mouse_down);
+  EXPECT_EQ(1, mouse_down_event.clickCount);
+
+  // Moving the cursor with a significant delay will reset the click count to 0.
+  mouse_move.time = mouse_down.time + 1000;
+  mouse_move.x = mouse_move.y = mouse_move.x_root = mouse_move.y_root =
+      mouse_down.x;
+  WebMouseEventBuilder::Build(&mouse_move);
+
+  mouse_up.time = mouse_move.time + 50;
+  mouse_up_event = WebMouseEventBuilder::Build(&mouse_up);
+  EXPECT_EQ(0, mouse_up_event.clickCount);
+}
+
+TEST(WebKeyboardEventBuilderTest, NumPadConversion) {
+  // Construct a GDK input event for the numpad "5" key.
+  char five[] = "5";
+  GdkEventKey gdk_event;
+  memset(&gdk_event, 0, sizeof(GdkEventKey));
+  gdk_event.type = GDK_KEY_PRESS;
+  gdk_event.keyval = GDK_KP_5;
+  gdk_event.string = five;
+
+  // Numpad flag should be set on the WebKeyboardEvent.
+  WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(&gdk_event);
+  EXPECT_TRUE(web_event.modifiers & WebInputEvent::IsKeyPad);
+}
+
+}  // anonymous namespace

content/browser/renderer_host/native_web_keyboard_event_gtk.cc

@@ -6,9 +6,7 @@
 
 #include <gdk/gdk.h>
 
-#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h"
-
-using WebKit::WebInputEventFactory;
+#include "content/browser/renderer_host/input/web_input_event_builders_gtk.h"
 
 namespace {
 
@@ -32,7 +30,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent()
 }
 
 NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
-    : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(&native_event->key)),
+    : WebKeyboardEvent(WebKeyboardEventBuilder::Build(&native_event->key)),
       skip_in_browser(false),
       match_edit_command(false) {
   CopyEventTo(native_event, &os_event);
@@ -41,7 +39,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
 NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character,
                                                int state,
                                                double time_stamp_seconds)
-    : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character,
+    : WebKeyboardEvent(WebKeyboardEventBuilder::Build(character,
                                                       state,
                                                       time_stamp_seconds)),
       os_event(NULL),

content/browser/renderer_host/render_widget_host_view_gtk.cc

@@ -29,6 +29,7 @@
 #include "content/browser/renderer_host/gtk_im_context_wrapper.h"
 #include "content/browser/renderer_host/gtk_key_bindings_handler.h"
 #include "content/browser/renderer_host/gtk_window_utils.h"
+#include "content/browser/renderer_host/input/web_input_event_builders_gtk.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
@@ -40,7 +41,6 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebScreenInfo.h"
-#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/x/active_window_watcher_x.h"
 #include "ui/base/x/x11_util.h"
@@ -50,7 +50,6 @@
 #include "ui/gfx/text_elider.h"
 #include "webkit/common/cursors/webcursor_gtk_data.h"
 
-using WebKit::WebInputEventFactory;
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebScreenInfo;
 
@@ -70,10 +69,6 @@ namespace {
 const int kMaxWindowWidth = 10000;
 const int kMaxWindowHeight = 10000;
 
-// See WebInputEventFactor.cpp for a reason for this being the default
-// scroll size for linux.
-const float kDefaultScrollPixelsPerTick = 160.0f / 3.0f;
-
 const GdkColor kBGColor =
 #if defined(NDEBUG)
     { 0, 0xff * 257, 0xff * 257, 0xff * 257 };
@@ -354,7 +349,7 @@ class RenderWidgetHostViewGtkWidget {
     RenderWidgetHostImpl* widget_host =
         RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost());
     if (widget_host)
-      widget_host->ForwardMouseEvent(WebInputEventFactory::mouseEvent(event));
+      widget_host->ForwardMouseEvent(WebMouseEventBuilder::Build(event));
 
     // Although we did handle the mouse event, we need to let other handlers
     // run (in particular the one installed by WebContentsViewGtk).
@@ -380,8 +375,7 @@ class RenderWidgetHostViewGtkWidget {
 
     host_view->ModifyEventForEdgeDragging(widget, event);
 
-    WebKit::WebMouseEvent mouse_event =
-        WebInputEventFactory::mouseEvent(event);
+    WebKit::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event);
 
     if (host_view->mouse_locked_) {
       gfx::Point center = host_view->GetWidgetCenter();
@@ -431,8 +425,7 @@ class RenderWidgetHostViewGtkWidget {
     // additionally send this crossing event with the state indicating the
     // button is down, it causes problems with drag and drop in WebKit.)
     if (!(event->state & any_button_mask)) {
-      WebKit::WebMouseEvent mouse_event =
-          WebInputEventFactory::mouseEvent(event);
+      WebKit::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event);
       host_view->ModifyEventMovementAndCoords(&mouse_event);
       // When crossing out and back into a render view the movement values
       // must represent the instantaneous movement of the mouse, not the jump
@@ -500,7 +493,7 @@ class RenderWidgetHostViewGtkWidget {
       gdk_event_put(event);
       gdk_event_free(event);
     }
-    return num_clicks * kDefaultScrollPixelsPerTick;
+    return num_clicks * WebMouseWheelEventBuilder::ScrollbarPixelsPerTick();
   }
 
   static gboolean OnMouseScrollEvent(GtkWidget* widget,
@@ -518,21 +511,23 @@ class RenderWidgetHostViewGtkWidget {
         event->direction = GDK_SCROLL_RIGHT;
     }
 
-    WebMouseWheelEvent web_event = WebInputEventFactory::mouseWheelEvent(event);
+    WebMouseWheelEvent web_event = WebMouseWheelEventBuilder::Build(event);
+    const float pixelsPerTick =
+        WebMouseWheelEventBuilder::ScrollbarPixelsPerTick();
     // We  peek ahead at the top of the queue to look for additional pending
     // scroll events.
     if (event->direction == GDK_SCROLL_UP ||
         event->direction == GDK_SCROLL_DOWN) {
       if (event->direction == GDK_SCROLL_UP)
-        web_event.deltaY = kDefaultScrollPixelsPerTick;
+        web_event.deltaY = pixelsPerTick;
       else
-        web_event.deltaY = -kDefaultScrollPixelsPerTick;
+        web_event.deltaY = -pixelsPerTick;
       web_event.deltaY += GetPendingScrollDelta(true, event->state);
     } else {
       if (event->direction == GDK_SCROLL_LEFT)
-        web_event.deltaX = kDefaultScrollPixelsPerTick;
+        web_event.deltaX = pixelsPerTick;
       else
-        web_event.deltaX = -kDefaultScrollPixelsPerTick;
+        web_event.deltaX = -pixelsPerTick;
       web_event.deltaX += GetPendingScrollDelta(false, event->state);
     }
     RenderWidgetHostImpl::From(

content/content_browser.gypi

@@ -844,6 +844,8 @@
     'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc',
     'browser/renderer_host/input/web_input_event_builders_android.cc',
     'browser/renderer_host/input/web_input_event_builders_android.h',
+    'browser/renderer_host/input/web_input_event_builders_gtk.cc',
+    'browser/renderer_host/input/web_input_event_builders_gtk.h',
     'browser/renderer_host/input/web_input_event_builders_win.cc',
     'browser/renderer_host/input/web_input_event_builders_win.h',
     'browser/renderer_host/input/web_input_event_util.cc',

content/content_tests.gypi

@@ -411,6 +411,7 @@
         'browser/renderer_host/synthetic_gesture_controller_unittest.cc',
         'browser/renderer_host/text_input_client_mac_unittest.mm',
         'browser/renderer_host/web_input_event_aura_unittest.cc',
+        'browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc',
         'browser/resolve_proxy_msg_helper_unittest.cc',
         'browser/site_instance_impl_unittest.cc',
         'browser/speech/chunked_byte_buffer_unittest.cc',