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

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

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

Powered by Google App Engine
This is Rietveld 408576698