Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 scoped_ptr<blink::WebInputEvent> ConvertWebInputEventToViewport( | |
|
Rick Byers
2015/11/27 02:15:56
nit: please add a TODO comment saying this mixing
| |
| 75 const blink::WebInputEvent& event, | |
| 76 float scale) { | |
| 77 scoped_ptr<blink::WebInputEvent> scaled_event; | |
| 78 if (scale == 1.f) | |
| 79 return scaled_event; | |
| 80 if (event.type == blink::WebMouseEvent::MouseWheel) { | |
| 81 blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent; | |
| 82 scaled_event.reset(wheel_event); | |
| 83 *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event); | |
|
tdresser
2015/11/27 21:35:20
Isn't there some way to avoid allocating an extra
oshima
2015/11/30 23:01:12
I thought it's risky to modify const object, which
| |
| 84 wheel_event->deltaX *= scale; | |
| 85 wheel_event->deltaY *= scale; | |
| 86 wheel_event->wheelTicksX *= scale; | |
| 87 wheel_event->wheelTicksY *= scale; | |
|
tdresser
2015/11/27 21:35:20
Is this correct, or should we recompute wheelTicks
oshima
2015/11/30 23:01:12
If delta X needs to be scaled, so this needs to be
| |
| 88 } else if (blink::WebInputEvent::isMouseEventType(event.type)) { | |
| 89 blink::WebMouseEvent* mouse_event = new blink::WebMouseEvent; | |
| 90 scaled_event.reset(mouse_event); | |
| 91 *mouse_event = static_cast<const blink::WebMouseEvent&>(event); | |
| 92 mouse_event->x *= scale; | |
| 93 mouse_event->y *= scale; | |
| 94 mouse_event->windowX = mouse_event->x; | |
| 95 mouse_event->windowY = mouse_event->y; | |
| 96 mouse_event->movementX *= scale; | |
| 97 mouse_event->movementY *= scale; | |
| 98 } else if (blink::WebInputEvent::isTouchEventType(event.type)) { | |
| 99 blink::WebTouchEvent* touch_event = new blink::WebTouchEvent; | |
| 100 scaled_event.reset(touch_event); | |
| 101 *touch_event = static_cast<const blink::WebTouchEvent&>(event); | |
| 102 for (unsigned i = 0; i < touch_event->touchesLength; i++) { | |
| 103 touch_event->touches[i].position.x *= scale; | |
| 104 touch_event->touches[i].position.y *= scale; | |
| 105 touch_event->touches[i].radiusX *= scale; | |
| 106 touch_event->touches[i].radiusY *= scale; | |
| 107 } | |
| 108 } else if (blink::WebInputEvent::isGestureEventType(event.type)) { | |
| 109 blink::WebGestureEvent* gesture_event = new blink::WebGestureEvent; | |
| 110 scaled_event.reset(gesture_event); | |
| 111 *gesture_event = static_cast<const blink::WebGestureEvent&>(event); | |
| 112 gesture_event->x *= scale; | |
| 113 gesture_event->y *= scale; | |
| 114 switch (gesture_event->type) { | |
| 115 case blink::WebInputEvent::GestureScrollUpdate: | |
| 116 gesture_event->data.scrollUpdate.deltaX *= scale; | |
| 117 gesture_event->data.scrollUpdate.deltaY *= scale; | |
| 118 break; | |
| 119 case blink::WebInputEvent::GestureScrollBegin: | |
| 120 gesture_event->data.scrollBegin.deltaXHint *= scale; | |
| 121 gesture_event->data.scrollBegin.deltaYHint *= scale; | |
| 122 break; | |
| 123 | |
| 124 case blink::WebInputEvent::GesturePinchUpdate: | |
| 125 // Scale in pinch gesture is DSF agnostic. | |
| 126 break; | |
| 127 | |
| 128 case blink::WebInputEvent::GestureDoubleTap: | |
| 129 case blink::WebInputEvent::GestureTap: | |
| 130 case blink::WebInputEvent::GestureTapUnconfirmed: | |
| 131 gesture_event->data.tap.width *= scale; | |
| 132 gesture_event->data.tap.height *= scale; | |
| 133 break; | |
| 134 | |
| 135 case blink::WebInputEvent::GestureTapDown: | |
| 136 gesture_event->data.tapDown.width *= scale; | |
| 137 gesture_event->data.tapDown.height *= scale; | |
| 138 break; | |
| 139 | |
| 140 case blink::WebInputEvent::GestureShowPress: | |
| 141 gesture_event->data.showPress.width *= scale; | |
| 142 gesture_event->data.showPress.height *= scale; | |
| 143 break; | |
| 144 | |
| 145 case blink::WebInputEvent::GestureLongPress: | |
| 146 case blink::WebInputEvent::GestureLongTap: | |
| 147 gesture_event->data.longPress.width *= scale; | |
| 148 gesture_event->data.longPress.height *= scale; | |
| 149 break; | |
| 150 | |
| 151 case blink::WebInputEvent::GestureTwoFingerTap: | |
| 152 gesture_event->data.twoFingerTap.firstFingerWidth *= scale; | |
| 153 gesture_event->data.twoFingerTap.firstFingerHeight *= scale; | |
| 154 break; | |
| 155 | |
| 156 case blink::WebInputEvent::GestureFlingStart: | |
| 157 gesture_event->data.flingStart.velocityX *= scale; | |
| 158 gesture_event->data.flingStart.velocityY *= scale; | |
| 159 break; | |
| 160 | |
| 161 // These event does not have location data. | |
| 162 case blink::WebInputEvent::GesturePinchBegin: | |
| 163 case blink::WebInputEvent::GesturePinchEnd: | |
| 164 case blink::WebInputEvent::GestureTapCancel: | |
| 165 case blink::WebInputEvent::GestureFlingCancel: | |
| 166 case blink::WebInputEvent::GestureScrollEnd: | |
| 167 break; | |
| 168 | |
| 169 // TODO(oshima): Find out if ContextMenu needs to be scaled. | |
| 170 default: | |
| 171 break; | |
| 172 } | |
| 173 } | |
| 174 return scaled_event; | |
| 175 } | |
| 176 | |
| 74 } // namespace content | 177 } // namespace content |
| OLD | NEW |