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> |
| 11 | 11 |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "content/common/content_switches_internal.h" | |
| 13 #include "content/common/input/web_touch_event_traits.h" | 14 #include "content/common/input/web_touch_event_traits.h" |
| 14 #include "ui/events/blink/blink_event_util.h" | 15 #include "ui/events/blink/blink_event_util.h" |
| 15 #include "ui/events/event_constants.h" | 16 #include "ui/events/event_constants.h" |
| 16 #include "ui/events/gesture_detection/gesture_event_data.h" | 17 #include "ui/events/gesture_detection/gesture_event_data.h" |
| 17 #include "ui/events/gesture_detection/motion_event.h" | 18 #include "ui/events/gesture_detection/motion_event.h" |
| 18 #include "ui/events/keycodes/dom/keycode_converter.h" | 19 #include "ui/events/keycodes/dom/keycode_converter.h" |
| 19 #include "ui/gfx/geometry/safe_integer_conversions.h" | 20 #include "ui/gfx/geometry/safe_integer_conversions.h" |
| 20 | 21 |
| 21 using blink::WebGestureEvent; | 22 using blink::WebGestureEvent; |
| 22 using blink::WebInputEvent; | 23 using blink::WebInputEvent; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 case ui::DomKeyLocation::RIGHT: | 65 case ui::DomKeyLocation::RIGHT: |
| 65 return blink::WebInputEvent::IsRight; | 66 return blink::WebInputEvent::IsRight; |
| 66 case ui::DomKeyLocation::NUMPAD: | 67 case ui::DomKeyLocation::NUMPAD: |
| 67 return blink::WebInputEvent::IsKeyPad; | 68 return blink::WebInputEvent::IsKeyPad; |
| 68 case ui::DomKeyLocation::STANDARD: | 69 case ui::DomKeyLocation::STANDARD: |
| 69 break; | 70 break; |
| 70 } | 71 } |
| 71 return static_cast<blink::WebInputEvent::Modifiers>(0); | 72 return static_cast<blink::WebInputEvent::Modifiers>(0); |
| 72 } | 73 } |
| 73 | 74 |
| 75 scoped_ptr<blink::WebInputEvent> ConvertWebInputEventToViewport( | |
| 76 const blink::WebInputEvent& event, | |
| 77 float scale) { | |
| 78 scoped_ptr<blink::WebInputEvent> scaled_event; | |
| 79 if (!IsUseZoomForDSFEnabled()) | |
| 80 return scaled_event; | |
|
Rick Byers
2015/11/12 19:45:36
this is uninitialized, did you mean 'event'?
oshima
2015/11/12 21:59:01
nullptr is used as a way to indicate that conversi
| |
| 81 if (event.type == blink::WebMouseEvent::MouseWheel) { | |
| 82 blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent; | |
| 83 scaled_event.reset(wheel_event); | |
| 84 *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event); | |
| 85 wheel_event->deltaX *= scale; | |
| 86 wheel_event->deltaY *= scale; | |
| 87 } else if (blink::WebInputEvent::isMouseEventType(event.type)) { | |
| 88 blink::WebMouseEvent* mouse_event = new blink::WebMouseEvent; | |
| 89 scaled_event.reset(mouse_event); | |
| 90 *mouse_event = static_cast<const blink::WebMouseEvent&>(event); | |
| 91 mouse_event->x *= scale; | |
| 92 mouse_event->y *= scale; | |
| 93 mouse_event->windowX = mouse_event->x; | |
| 94 mouse_event->windowY = mouse_event->y; | |
| 95 mouse_event->movementX *= scale; | |
| 96 mouse_event->movementY *= scale; | |
| 97 } else if (blink::WebInputEvent::isTouchEventType(event.type)) { | |
| 98 blink::WebTouchEvent* touch_event = new blink::WebTouchEvent; | |
| 99 scaled_event.reset(touch_event); | |
| 100 *touch_event = static_cast<const blink::WebTouchEvent&>(event); | |
| 101 for (unsigned i = 0; i < touch_event->touchesLength; i++) { | |
| 102 touch_event->touches[i].position.x *= scale; | |
| 103 touch_event->touches[i].position.y *= scale; | |
| 104 touch_event->touches[i].radiusX *= scale; | |
| 105 touch_event->touches[i].radiusY *= scale; | |
| 106 } | |
| 107 } else if (blink::WebInputEvent::isGestureEventType(event.type)) { | |
| 108 blink::WebGestureEvent* gesture_event = new blink::WebGestureEvent; | |
| 109 scaled_event.reset(gesture_event); | |
| 110 *gesture_event = static_cast<const blink::WebGestureEvent&>(event); | |
| 111 gesture_event->x *= scale; | |
| 112 gesture_event->y *= scale; | |
| 113 switch (gesture_event->type) { | |
| 114 case blink::WebInputEvent::GestureScrollUpdate: | |
| 115 gesture_event->data.scrollUpdate.deltaX *= scale; | |
| 116 gesture_event->data.scrollUpdate.deltaY *= scale; | |
| 117 break; | |
| 118 case blink::WebInputEvent::GestureScrollBegin: | |
| 119 gesture_event->data.scrollBegin.deltaXHint *= scale; | |
| 120 gesture_event->data.scrollBegin.deltaYHint *= scale; | |
| 121 break; | |
| 122 | |
| 123 case blink::WebInputEvent::GesturePinchBegin: | |
| 124 case blink::WebInputEvent::GesturePinchUpdate: | |
| 125 case blink::WebInputEvent::GesturePinchEnd: | |
| 126 // | |
|
Rick Byers
2015/11/12 19:45:36
why isn't pinch scale scaled?
oshima
2015/11/12 21:59:01
pinch only has scale, which is agnostic to dsf. I
| |
| 127 break; | |
| 128 | |
| 129 case blink::WebInputEvent::GestureDoubleTap: | |
| 130 case blink::WebInputEvent::GestureTap: | |
| 131 case blink::WebInputEvent::GestureTapUnconfirmed: | |
| 132 gesture_event->data.tap.width *= scale; | |
| 133 gesture_event->data.tap.height *= scale; | |
| 134 break; | |
| 135 | |
| 136 case blink::WebInputEvent::GestureTapDown: | |
| 137 gesture_event->data.tapDown.width *= scale; | |
| 138 gesture_event->data.tapDown.height *= scale; | |
| 139 break; | |
| 140 | |
| 141 case blink::WebInputEvent::GestureShowPress: | |
| 142 gesture_event->data.showPress.width *= scale; | |
| 143 gesture_event->data.showPress.height *= scale; | |
| 144 break; | |
| 145 | |
| 146 case blink::WebInputEvent::GestureLongPress: | |
| 147 case blink::WebInputEvent::GestureLongTap: | |
| 148 gesture_event->data.longPress.width *= scale; | |
| 149 gesture_event->data.longPress.height *= scale; | |
| 150 break; | |
| 151 | |
| 152 case blink::WebInputEvent::GestureTwoFingerTap: | |
| 153 gesture_event->data.twoFingerTap.firstFingerWidth *= scale; | |
| 154 gesture_event->data.twoFingerTap.firstFingerHeight *= scale; | |
| 155 break; | |
| 156 | |
| 157 case blink::WebInputEvent::GestureFlingStart: | |
| 158 gesture_event->data.flingStart.velocityX *= scale; | |
| 159 gesture_event->data.flingStart.velocityY *= scale; | |
| 160 break; | |
| 161 | |
| 162 case blink::WebInputEvent::GestureTapCancel: | |
| 163 case blink::WebInputEvent::GestureFlingCancel: | |
| 164 case blink::WebInputEvent::GestureScrollEnd: | |
| 165 break; | |
| 166 | |
| 167 default: | |
| 168 break; | |
| 169 } | |
| 170 } | |
| 171 return scaled_event; | |
| 172 } | |
| 173 | |
| 74 } // namespace content | 174 } // namespace content |
| OLD | NEW |