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

Side by Side Diff: content/browser/renderer_host/input/web_input_event_util.cc

Issue 1440923002: Convert the coordinates in WebInputEvent To Viewport in InputRouter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // MSVC++ requires this to be set before any other includes to get M_PI. 5 // MSVC++ requires this to be set before any other includes to get M_PI.
6 #define _USE_MATH_DEFINES 6 #define _USE_MATH_DEFINES
7 7
8 #include "content/browser/renderer_host/input/web_input_event_util.h" 8 #include "content/browser/renderer_host/input/web_input_event_util.h"
9 9
10 #include <cmath> 10 #include <cmath>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 case ui::DomKeyLocation::RIGHT: 64 case ui::DomKeyLocation::RIGHT:
65 return blink::WebInputEvent::IsRight; 65 return blink::WebInputEvent::IsRight;
66 case ui::DomKeyLocation::NUMPAD: 66 case ui::DomKeyLocation::NUMPAD:
67 return blink::WebInputEvent::IsKeyPad; 67 return blink::WebInputEvent::IsKeyPad;
68 case ui::DomKeyLocation::STANDARD: 68 case ui::DomKeyLocation::STANDARD:
69 break; 69 break;
70 } 70 }
71 return static_cast<blink::WebInputEvent::Modifiers>(0); 71 return static_cast<blink::WebInputEvent::Modifiers>(0);
72 } 72 }
73 73
74 // This coversino is temporary. WebInputEvent should be generated
75 // directly fromui::Event with the viewport coordinates. See
76 // crbug.com/563730.
77 scoped_ptr<blink::WebInputEvent> ConvertWebInputEventToViewport(
78 const blink::WebInputEvent& event,
79 float scale) {
80 scoped_ptr<blink::WebInputEvent> scaled_event;
81 if (scale == 1.f)
82 return scaled_event;
83 if (event.type == blink::WebMouseEvent::MouseWheel) {
84 blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent;
85 scaled_event.reset(wheel_event);
86 *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
87 wheel_event->deltaX *= scale;
88 wheel_event->deltaY *= scale;
89 wheel_event->wheelTicksX *= scale;
90 wheel_event->wheelTicksY *= scale;
91 } else if (blink::WebInputEvent::isMouseEventType(event.type)) {
92 blink::WebMouseEvent* mouse_event = new blink::WebMouseEvent;
93 scaled_event.reset(mouse_event);
94 *mouse_event = static_cast<const blink::WebMouseEvent&>(event);
95 mouse_event->x *= scale;
96 mouse_event->y *= scale;
97 mouse_event->windowX = mouse_event->x;
98 mouse_event->windowY = mouse_event->y;
99 mouse_event->movementX *= scale;
100 mouse_event->movementY *= scale;
101 } else if (blink::WebInputEvent::isTouchEventType(event.type)) {
102 blink::WebTouchEvent* touch_event = new blink::WebTouchEvent;
103 scaled_event.reset(touch_event);
104 *touch_event = static_cast<const blink::WebTouchEvent&>(event);
105 for (unsigned i = 0; i < touch_event->touchesLength; i++) {
106 touch_event->touches[i].position.x *= scale;
107 touch_event->touches[i].position.y *= scale;
108 touch_event->touches[i].radiusX *= scale;
109 touch_event->touches[i].radiusY *= scale;
110 }
111 } else if (blink::WebInputEvent::isGestureEventType(event.type)) {
112 blink::WebGestureEvent* gesture_event = new blink::WebGestureEvent;
113 scaled_event.reset(gesture_event);
114 *gesture_event = static_cast<const blink::WebGestureEvent&>(event);
115 gesture_event->x *= scale;
116 gesture_event->y *= scale;
117 switch (gesture_event->type) {
118 case blink::WebInputEvent::GestureScrollUpdate:
119 gesture_event->data.scrollUpdate.deltaX *= scale;
120 gesture_event->data.scrollUpdate.deltaY *= scale;
121 break;
122 case blink::WebInputEvent::GestureScrollBegin:
123 gesture_event->data.scrollBegin.deltaXHint *= scale;
124 gesture_event->data.scrollBegin.deltaYHint *= scale;
125 break;
126
127 case blink::WebInputEvent::GesturePinchUpdate:
128 // Scale in pinch gesture is DSF agnostic.
129 break;
130
131 case blink::WebInputEvent::GestureDoubleTap:
132 case blink::WebInputEvent::GestureTap:
133 case blink::WebInputEvent::GestureTapUnconfirmed:
134 gesture_event->data.tap.width *= scale;
135 gesture_event->data.tap.height *= scale;
136 break;
137
138 case blink::WebInputEvent::GestureTapDown:
139 gesture_event->data.tapDown.width *= scale;
140 gesture_event->data.tapDown.height *= scale;
141 break;
142
143 case blink::WebInputEvent::GestureShowPress:
144 gesture_event->data.showPress.width *= scale;
145 gesture_event->data.showPress.height *= scale;
146 break;
147
148 case blink::WebInputEvent::GestureLongPress:
149 case blink::WebInputEvent::GestureLongTap:
150 gesture_event->data.longPress.width *= scale;
151 gesture_event->data.longPress.height *= scale;
152 break;
153
154 case blink::WebInputEvent::GestureTwoFingerTap:
155 gesture_event->data.twoFingerTap.firstFingerWidth *= scale;
156 gesture_event->data.twoFingerTap.firstFingerHeight *= scale;
157 break;
158
159 case blink::WebInputEvent::GestureFlingStart:
160 gesture_event->data.flingStart.velocityX *= scale;
161 gesture_event->data.flingStart.velocityY *= scale;
162 break;
163
164 // These event does not have location data.
165 case blink::WebInputEvent::GesturePinchBegin:
166 case blink::WebInputEvent::GesturePinchEnd:
167 case blink::WebInputEvent::GestureTapCancel:
168 case blink::WebInputEvent::GestureFlingCancel:
169 case blink::WebInputEvent::GestureScrollEnd:
170 break;
171
172 // TODO(oshima): Find out if ContextMenu needs to be scaled.
173 default:
174 break;
175 }
176 }
177 return scaled_event;
178 }
179
74 } // namespace content 180 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698