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

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

Issue 567783002: Add modifier flags to MotionEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove MotionEvent modifiers Created 6 years, 3 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
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/input/web_input_event_util.h"
7 #include "content/browser/renderer_host/ui_events_helper.h" 8 #include "content/browser/renderer_host/ui_events_helper.h"
8 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
9 #include "ui/events/event.h" 10 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 11 #include "ui/events/event_utils.h"
11 12
12 #if defined(USE_OZONE) 13 #if defined(USE_OZONE)
13 #include "ui/events/keycodes/keyboard_code_conversion.h" 14 #include "ui/events/keycodes/keyboard_code_conversion.h"
14 #endif 15 #endif
15 16
16 namespace content { 17 namespace content {
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 webkit_event.deltaY = event->y_offset(); 361 webkit_event.deltaY = event->y_offset();
361 } 362 }
362 363
363 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; 364 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
364 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; 365 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
365 366
366 return webkit_event; 367 return webkit_event;
367 } 368 }
368 369
369 } // namespace content 370 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698