Android mouse events shouldn't appear as TouchEvents

content/browser/renderer_host/input/web_input_event_builders_android.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_android.h"
 
 #include <android/input.h>
 
 #include "base/logging.h"
 #include "ui/events/android/key_event_utils.h"
@@ skipping 94 matching lines @@
     // is apparently just how webkit handles it and what it expects.
     result.unmodifiedText[0] = '\r';
   }
   result.text[0] = result.unmodifiedText[0];
   result.isSystemKey = is_system_key;
 
   return result;
 }
 
 WebMouseEvent WebMouseEventBuilder::Build(
-    WebInputEvent::Type type,
-    WebMouseEvent::Button button,
-    double time_sec,
-    int window_x,
-    int window_y,
-    int modifiers,
-    int click_count,
-    WebPointerProperties::PointerType pointer_type) {
+      WebInputEvent::Type type,
+      double time_sec,
+      int window_x,
+      int window_y,
+      int modifiers,
+      int click_count,
+      int pointer_id,
+      float pressure,
+      float orientation_rad,
+      float tilt_rad,
+      int old_button_state,
+      int new_button_state,
+      int tool_type) {
 
   DCHECK(WebInputEvent::isMouseEventType(type));
   WebMouseEvent result;
 
   result.type = type;
-  result.pointerType = pointer_type;
   result.x = window_x;
   result.y = window_y;
   result.windowX = window_x;
   result.windowY = window_y;
   result.timeStampSeconds = time_sec;
   result.clickCount = click_count;
-  result.modifiers = modifiers;
+  result.modifiers = ui::EventFlagsToWebEventModifiers(modifiers);
 
-  if (type == WebInputEvent::MouseDown || type == WebInputEvent::MouseUp)
-    result.button = button;
-  else
-    result.button = WebMouseEvent::Button::NoButton;
+  int android_buttons_changed = 0;
+  if (type == WebInputEvent::MouseDown)
+      android_buttons_changed = new_button_state & ~old_button_state;
+  else if (type == WebInputEvent::MouseUp)
+      android_buttons_changed = old_button_state & ~new_button_state;
+
+  ui::SetWebPointerPropertiesFromMotionEventData(
+      result,
+      pointer_id,
+      pressure,
+      orientation_rad,
+      tilt_rad,
+      android_buttons_changed,
+      tool_type);
 
   return result;
 }
 
 WebMouseWheelEvent WebMouseWheelEventBuilder::Build(float ticks_x,
                                                     float ticks_y,
                                                     float tick_multiplier,
                                                     double time_sec,
                                                     int window_x,
                                                     int window_y) {
@@ skipping 25 matching lines @@
   result.type = type;
   result.x = x;
   result.y = y;
   result.timeStampSeconds = time_sec;
   result.sourceDevice = blink::WebGestureDeviceTouchscreen;
 
   return result;
 }
 
 }  // namespace content