Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1148)

Unified Diff: content/browser/renderer_host/input/input_router_impl.cc

Issue 260123003: Revert of Remove smiluate-touch-screen-with-mouse content flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl.h ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/input_router_impl.cc
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc
index 83f6fcb164f066646547a34903fa98d2e0f8e787..8f1682a64672bd26693a88285c99736aee7c431f 100644
--- a/content/browser/renderer_host/input/input_router_impl.cc
+++ b/content/browser/renderer_host/input/input_router_impl.cc
@@ -97,6 +97,24 @@
if (modeString != "")
LOG(ERROR) << "Invalid --touch-scrolling-mode option: " << modeString;
return TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT;
+}
+
+GestureEventWithLatencyInfo MakeGestureEvent(WebInputEvent::Type type,
+ double timestamp_seconds,
+ int x,
+ int y,
+ int modifiers,
+ const ui::LatencyInfo& latency) {
+ WebGestureEvent result;
+
+ result.type = type;
+ result.x = x;
+ result.y = y;
+ result.sourceDevice = WebGestureEvent::Touchscreen;
+ result.timeStampSeconds = timestamp_seconds;
+ result.modifiers = modifiers;
+
+ return GestureEventWithLatencyInfo(result, latency);
}
const char* GetEventAckName(InputEventAckState ack_result) {
@@ -166,6 +184,14 @@
void InputRouterImpl::SendMouseEvent(
const MouseEventWithLatencyInfo& mouse_event) {
+ // Order is important here; we need to convert all MouseEvents before they
+ // propagate further, e.g., to the tap suppression controller.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSimulateTouchScreenWithMouse)) {
+ SimulateTouchGestureWithMouse(mouse_event);
+ return;
+ }
+
if (mouse_event.event.type == WebInputEvent::MouseDown &&
gesture_event_queue_.GetTouchpadTapSuppressionController()->
ShouldDeferMouseDown(mouse_event))
@@ -702,6 +728,86 @@
event, (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result));
}
+void InputRouterImpl::SimulateTouchGestureWithMouse(
+ const MouseEventWithLatencyInfo& event) {
+ const WebMouseEvent& mouse_event = event.event;
+ int x = mouse_event.x, y = mouse_event.y;
+ float dx = mouse_event.movementX, dy = mouse_event.movementY;
+ static int startX = 0, startY = 0;
+
+ switch (mouse_event.button) {
+ case WebMouseEvent::ButtonLeft:
+ if (mouse_event.type == WebInputEvent::MouseDown) {
+ startX = x;
+ startY = y;
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureScrollBegin, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ if (dx != 0 || dy != 0) {
+ GestureEventWithLatencyInfo gesture_event = MakeGestureEvent(
+ WebInputEvent::GestureScrollUpdate, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency);
+ gesture_event.event.data.scrollUpdate.deltaX = dx;
+ gesture_event.event.data.scrollUpdate.deltaY = dy;
+ SendGestureEvent(gesture_event);
+ }
+ if (mouse_event.type == WebInputEvent::MouseUp) {
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureScrollEnd, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ break;
+ case WebMouseEvent::ButtonMiddle:
+ if (mouse_event.type == WebInputEvent::MouseDown) {
+ startX = x;
+ startY = y;
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureShowPress, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureTapDown, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ if (mouse_event.type == WebInputEvent::MouseUp) {
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureTap, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ break;
+ case WebMouseEvent::ButtonRight:
+ if (mouse_event.type == WebInputEvent::MouseDown) {
+ startX = x;
+ startY = y;
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureScrollBegin, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GesturePinchBegin, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ if (dx != 0 || dy != 0) {
+ dx = pow(dy < 0 ? 0.998f : 1.002f, fabs(dy));
+ GestureEventWithLatencyInfo gesture_event = MakeGestureEvent(
+ WebInputEvent::GesturePinchUpdate, mouse_event.timeStampSeconds,
+ startX, startY, 0, event.latency);
+ gesture_event.event.data.pinchUpdate.scale = dx;
+ SendGestureEvent(gesture_event);
+ }
+ if (mouse_event.type == WebInputEvent::MouseUp) {
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GesturePinchEnd, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ SendGestureEvent(MakeGestureEvent(
+ WebInputEvent::GestureScrollEnd, mouse_event.timeStampSeconds,
+ x, y, 0, event.latency));
+ }
+ break;
+ case WebMouseEvent::ButtonNone:
+ break;
+ }
+}
+
void InputRouterImpl::UpdateTouchAckTimeoutEnabled() {
if (!touch_ack_timeout_supported_) {
touch_event_queue_.SetAckTimeoutEnabled(false, base::TimeDelta());
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl.h ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698