| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/motion_event_web.h" | 8 #include "content/browser/renderer_host/input/motion_event_web.h" |
| 9 | 9 |
| 10 #include <cmath> | 10 #include <cmath> |
| 11 | 11 |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "content/browser/renderer_host/input/web_input_event_util.h" | |
| 14 #include "content/common/input/web_touch_event_traits.h" | 13 #include "content/common/input/web_touch_event_traits.h" |
| 14 #include "ui/events/blink/blink_event_util.h" |
| 15 | 15 |
| 16 using blink::WebInputEvent; | 16 using blink::WebInputEvent; |
| 17 using blink::WebPointerProperties; | 17 using blink::WebPointerProperties; |
| 18 using blink::WebTouchEvent; | 18 using blink::WebTouchEvent; |
| 19 using blink::WebTouchPoint; | 19 using blink::WebTouchPoint; |
| 20 | 20 |
| 21 namespace content { | 21 namespace content { |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 ui::MotionEvent::Action GetActionFrom(const WebTouchEvent& event) { | 24 ui::MotionEvent::Action GetActionFrom(const WebTouchEvent& event) { |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 } | 210 } |
| 211 NOTREACHED() << "Unexpected pointerType"; | 211 NOTREACHED() << "Unexpected pointerType"; |
| 212 return TOOL_TYPE_UNKNOWN; | 212 return TOOL_TYPE_UNKNOWN; |
| 213 } | 213 } |
| 214 | 214 |
| 215 int MotionEventWeb::GetButtonState() const { | 215 int MotionEventWeb::GetButtonState() const { |
| 216 return 0; | 216 return 0; |
| 217 } | 217 } |
| 218 | 218 |
| 219 int MotionEventWeb::GetFlags() const { | 219 int MotionEventWeb::GetFlags() const { |
| 220 return WebEventModifiersToEventFlags(event_.modifiers); | 220 return ui::WebEventModifiersToEventFlags(event_.modifiers); |
| 221 } | 221 } |
| 222 | 222 |
| 223 } // namespace content | 223 } // namespace content |
| OLD | NEW |