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

Side by Side Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 10824247: Remove GestureEvent interface, and rename GestureEventImpl to GestureEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
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/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/base/event.h" 8 #include "ui/base/event.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 11 matching lines...) Expand all
22 base::NativeEvent native_event, WebKit::WebTouchEvent* web_event); 22 base::NativeEvent native_event, WebKit::WebTouchEvent* web_event);
23 #else 23 #else
24 WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event); 24 WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event);
25 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( 25 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
26 ui::MouseEvent* event); 26 ui::MouseEvent* event);
27 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( 27 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
28 ui::ScrollEvent* event); 28 ui::ScrollEvent* event);
29 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( 29 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
30 ui::KeyEvent* event); 30 ui::KeyEvent* event);
31 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( 31 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
32 ui::GestureEventImpl* event); 32 ui::GestureEvent* event);
33 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( 33 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
34 ui::ScrollEvent* event); 34 ui::ScrollEvent* event);
35 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent( 35 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
36 ui::TouchEvent* event, WebKit::WebTouchEvent* web_event); 36 ui::TouchEvent* event, WebKit::WebTouchEvent* web_event);
37 #endif 37 #endif
38 38
39 // General approach: 39 // General approach:
40 // 40 //
41 // ui::Event only carries a subset of possible event data provided to Aura by 41 // ui::Event only carries a subset of possible event data provided to Aura by
42 // the host platform. WebKit utilizes a larger subset of that information than 42 // the host platform. WebKit utilizes a larger subset of that information than
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function 132 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function
133 // to detect this case so the right event type can be constructed. 133 // to detect this case so the right event type can be constructed.
134 #if defined(OS_WIN) 134 #if defined(OS_WIN)
135 // Key events require no translation by the aura system. 135 // Key events require no translation by the aura system.
136 return MakeWebKeyboardEventFromNativeEvent(event->native_event()); 136 return MakeWebKeyboardEventFromNativeEvent(event->native_event());
137 #else 137 #else
138 return MakeWebKeyboardEventFromAuraEvent(event); 138 return MakeWebKeyboardEventFromAuraEvent(event);
139 #endif 139 #endif
140 } 140 }
141 141
142 WebKit::WebGestureEvent MakeWebGestureEvent(ui::GestureEventImpl* event) { 142 WebKit::WebGestureEvent MakeWebGestureEvent(ui::GestureEvent* event) {
143 WebKit::WebGestureEvent gesture_event; 143 WebKit::WebGestureEvent gesture_event;
144 #if defined(OS_WIN) 144 #if defined(OS_WIN)
145 gesture_event = MakeWebGestureEventFromNativeEvent(event->native_event()); 145 gesture_event = MakeWebGestureEventFromNativeEvent(event->native_event());
146 #else 146 #else
147 gesture_event = MakeWebGestureEventFromAuraEvent(event); 147 gesture_event = MakeWebGestureEventFromAuraEvent(event);
148 #endif 148 #endif
149 149
150 gesture_event.x = event->x(); 150 gesture_event.x = event->x();
151 gesture_event.y = event->y(); 151 gesture_event.y = event->y();
152 152
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event, 187 WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event,
188 WebKit::WebTouchEvent* web_event) { 188 WebKit::WebTouchEvent* web_event) {
189 #if defined(OS_WIN) 189 #if defined(OS_WIN)
190 return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event); 190 return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event);
191 #else 191 #else
192 return UpdateWebTouchEventFromAuraEvent(event, web_event); 192 return UpdateWebTouchEventFromAuraEvent(event, web_event);
193 #endif 193 #endif
194 } 194 }
195 195
196 } // namespace content 196 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.h ('k') | content/browser/renderer_host/web_input_event_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698