Touch emulator: clear mouse buttons modifiers on emulated touch events.

content/browser/renderer_host/input/touch_emulator.cc

 // Copyright 2014 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/touch_emulator.h"
 
 #include "build/build_config.h"
 #include "content/browser/renderer_host/input/motion_event_web.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_touch_event_traits.h"
@@ skipping 21 matching lines @@
 ui::GestureProvider::Config GetEmulatorGestureProviderConfig(
     ui::GestureProviderConfigType config_type) {
   ui::GestureProvider::Config config =
       ui::GetGestureProviderConfig(config_type);
   config.gesture_begin_end_types_enabled = false;
   config.gesture_detector_config.swipe_enabled = false;
   config.gesture_detector_config.two_finger_tap_enabled = false;
   return config;
 }
 
+int ModifiersWithoutMouseButtons(const WebInputEvent& event) {
+  const int all_buttons = WebInputEvent::LeftButtonDown |
+      WebInputEvent::MiddleButtonDown | WebInputEvent::RightButtonDown;
+  return event.modifiers & ~all_buttons;
+}
+
 // Time between two consecutive mouse moves, during which second mouse move
 // is not converted to touch.
 const double kMouseMoveDropIntervalSeconds = 5.f / 1000;
 
 } // namespace
 
 TouchEmulator::TouchEmulator(TouchEmulatorClient* client,
                              float device_scale_factor)
     : client_(client),
       gesture_provider_config_type_(
@@ skipping 339 matching lines @@
 void TouchEmulator::PinchEnd(const WebGestureEvent& event) {
   DCHECK(pinch_gesture_active_);
   pinch_gesture_active_ = false;
   FillPinchEvent(event);
   pinch_event_.type = WebInputEvent::GesturePinchEnd;
   client_->ForwardEmulatedGestureEvent(pinch_event_);
 }
 
 void TouchEmulator::FillPinchEvent(const WebInputEvent& event) {
   pinch_event_.timeStampSeconds = event.timeStampSeconds;
-  pinch_event_.modifiers = event.modifiers;
+  pinch_event_.modifiers = ModifiersWithoutMouseButtons(event);
   pinch_event_.sourceDevice = blink::WebGestureDeviceTouchscreen;
   pinch_event_.x = pinch_anchor_.x();
   pinch_event_.y = pinch_anchor_.y();
 }
 
 void TouchEmulator::ScrollEnd(const WebGestureEvent& event) {
   WebGestureEvent scroll_event;
   scroll_event.timeStampSeconds = event.timeStampSeconds;
-  scroll_event.modifiers = event.modifiers;
+  scroll_event.modifiers = ModifiersWithoutMouseButtons(event);
   scroll_event.sourceDevice = blink::WebGestureDeviceTouchscreen;
   scroll_event.type = WebInputEvent::GestureScrollEnd;
   client_->ForwardEmulatedGestureEvent(scroll_event);
 }
 
 void TouchEmulator::FillTouchEventAndPoint(const WebMouseEvent& mouse_event) {
   WebInputEvent::Type eventType;
   switch (mouse_event.type) {
     case WebInputEvent::MouseDown:
       eventType = WebInputEvent::TouchStart;
       break;
     case WebInputEvent::MouseMove:
       eventType = WebInputEvent::TouchMove;
       break;
     case WebInputEvent::MouseUp:
       eventType = WebInputEvent::TouchEnd;
       break;
     default:
       eventType = WebInputEvent::Undefined;
       NOTREACHED() << "Invalid event for touch emulation: " << mouse_event.type;
   }
   touch_event_.touchesLength = 1;
-  touch_event_.modifiers = mouse_event.modifiers;
+  touch_event_.modifiers = ModifiersWithoutMouseButtons(mouse_event);
   WebTouchEventTraits::ResetTypeAndTouchStates(
       eventType, mouse_event.timeStampSeconds, &touch_event_);
 
   WebTouchPoint& point = touch_event_.touches[0];
   point.id = 0;
   point.radiusX = 0.5f * cursor_size_.width();
   point.radiusY = 0.5f * cursor_size_.height();
   point.force = 1.f;
   point.rotationAngle = 0.f;
   point.position.x = mouse_event.x;
   point.screenPosition.x = mouse_event.globalX;
   point.position.y = mouse_event.y;
   point.screenPosition.y = mouse_event.globalY;
   point.tiltX = 0;
   point.tiltY = 0;
   point.pointerType = blink::WebPointerProperties::PointerType::Touch;
 }
 
 bool TouchEmulator::InPinchGestureMode() const {
   return shift_pressed_;
 }
 
 }  // namespace content