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

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

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased for parallel breaking changes Created 6 years, 6 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 "content/browser/renderer_host/ui_events_helper.h" 7 #include "content/browser/renderer_host/ui_events_helper.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 case ui::ET_SCROLL_FLING_CANCEL: 170 case ui::ET_SCROLL_FLING_CANCEL:
171 webkit_event.type = blink::WebInputEvent::GestureFlingCancel; 171 webkit_event.type = blink::WebInputEvent::GestureFlingCancel;
172 break; 172 break;
173 case ui::ET_SCROLL: 173 case ui::ET_SCROLL:
174 NOTREACHED() << "Invalid gesture type: " << event->type(); 174 NOTREACHED() << "Invalid gesture type: " << event->type();
175 break; 175 break;
176 default: 176 default:
177 NOTREACHED() << "Unknown gesture type: " << event->type(); 177 NOTREACHED() << "Unknown gesture type: " << event->type();
178 } 178 }
179 179
180 webkit_event.sourceDevice = blink::WebGestureEvent::Touchpad; 180 webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad;
181 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 181 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
182 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); 182 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
183 return webkit_event; 183 return webkit_event;
184 } 184 }
185 185
186 #endif 186 #endif
187 187
188 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent( 188 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
189 ui::MouseEvent* event); 189 ui::MouseEvent* event);
190 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( 190 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 gesture_event.globalY = root_point.y(); 342 gesture_event.globalY = root_point.y();
343 343
344 return gesture_event; 344 return gesture_event;
345 } 345 }
346 346
347 blink::WebGestureEvent MakeWebGestureEventFlingCancel() { 347 blink::WebGestureEvent MakeWebGestureEventFlingCancel() {
348 blink::WebGestureEvent gesture_event; 348 blink::WebGestureEvent gesture_event;
349 349
350 // All other fields are ignored on a GestureFlingCancel event. 350 // All other fields are ignored on a GestureFlingCancel event.
351 gesture_event.type = blink::WebInputEvent::GestureFlingCancel; 351 gesture_event.type = blink::WebInputEvent::GestureFlingCancel;
352 gesture_event.sourceDevice = blink::WebGestureEvent::Touchpad; 352 gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
353 return gesture_event; 353 return gesture_event;
354 } 354 }
355 355
356 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { 356 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) {
357 blink::WebMouseEvent webkit_event; 357 blink::WebMouseEvent webkit_event;
358 358
359 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 359 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
360 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); 360 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
361 361
362 webkit_event.button = blink::WebMouseEvent::ButtonNone; 362 webkit_event.button = blink::WebMouseEvent::ButtonNone;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 webkit_event.deltaY = event->y_offset(); 407 webkit_event.deltaY = event->y_offset();
408 } 408 }
409 409
410 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; 410 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
411 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; 411 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
412 412
413 return webkit_event; 413 return webkit_event;
414 } 414 }
415 415
416 } // namespace content 416 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/ui_events_helper.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698