OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/ui_events_helper.h" | 5 #include "content/browser/renderer_host/ui_events_helper.h" |
6 | 6 |
7 #include "content/browser/renderer_host/input/web_input_event_util.h" | 7 #include "content/browser/renderer_host/input/web_input_event_util.h" |
8 #include "content/common/input/web_touch_event_traits.h" | 8 #include "content/common/input/web_touch_event_traits.h" |
9 #include "third_party/WebKit/public/web/WebInputEvent.h" | 9 #include "third_party/WebKit/public/web/WebInputEvent.h" |
10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 else | 74 else |
75 location = point.screenPosition; | 75 location = point.screenPosition; |
76 ui::TouchEvent* uievent = new ui::TouchEvent(type, | 76 ui::TouchEvent* uievent = new ui::TouchEvent(type, |
77 location, | 77 location, |
78 flags, | 78 flags, |
79 point.id, | 79 point.id, |
80 timestamp, | 80 timestamp, |
81 point.radiusX, | 81 point.radiusX, |
82 point.radiusY, | 82 point.radiusY, |
83 point.rotationAngle, | 83 point.rotationAngle, |
84 point.force); | 84 point.force, |
| 85 point.tilt, |
| 86 point.tiltDirection); |
85 uievent->set_latency(touch_with_latency.latency); | 87 uievent->set_latency(touch_with_latency.latency); |
86 list->push_back(uievent); | 88 list->push_back(uievent); |
87 } | 89 } |
88 return true; | 90 return true; |
89 } | 91 } |
90 | 92 |
91 blink::WebGestureEvent MakeWebGestureEventFromUIEvent( | 93 blink::WebGestureEvent MakeWebGestureEventFromUIEvent( |
92 const ui::GestureEvent& event) { | 94 const ui::GestureEvent& event) { |
93 return CreateWebGestureEvent(event.details(), | 95 return CreateWebGestureEvent(event.details(), |
94 event.time_stamp(), | 96 event.time_stamp(), |
95 event.location_f(), | 97 event.location_f(), |
96 event.root_location_f(), | 98 event.root_location_f(), |
97 event.flags()); | 99 event.flags()); |
98 } | 100 } |
99 | 101 |
100 } // namespace content | 102 } // namespace content |
OLD | NEW |