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

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

Issue 12223110: aura: Populate and use the newly added acceleration ratio fields in wheel-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 10 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // Portions based heavily on: 5 // Portions based heavily on:
6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp 6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp
7 // 7 //
8 /* 8 /*
9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( 138 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
139 ui::ScrollEvent* event) { 139 ui::ScrollEvent* event) {
140 WebKit::WebMouseWheelEvent webkit_event; 140 WebKit::WebMouseWheelEvent webkit_event;
141 141
142 webkit_event.type = WebKit::WebInputEvent::MouseWheel; 142 webkit_event.type = WebKit::WebInputEvent::MouseWheel;
143 webkit_event.button = WebKit::WebMouseEvent::ButtonNone; 143 webkit_event.button = WebKit::WebMouseEvent::ButtonNone;
144 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 144 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
145 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); 145 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
146 webkit_event.hasPreciseScrollingDeltas = true; 146 webkit_event.hasPreciseScrollingDeltas = true;
147 webkit_event.deltaX = event->x_offset(); 147 webkit_event.deltaX = event->x_offset();
148 if (event->x_offset_ordinal() != 0.f && event->x_offset() != 0.f) {
149 webkit_event.accelerationRatioX =
150 event->x_offset_ordinal() / event->x_offset();
151 }
148 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; 152 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
149 webkit_event.deltaY = event->y_offset(); 153 webkit_event.deltaY = event->y_offset();
150 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; 154 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
155 if (event->y_offset_ordinal() != 0.f && event->y_offset() != 0.f) {
156 webkit_event.accelerationRatioY =
157 event->y_offset_ordinal() / event->y_offset();
158 }
151 159
152 return webkit_event; 160 return webkit_event;
153 } 161 }
154 162
155 // NOTE: ui::ScrollEvent instances come from the touchpad. 163 // NOTE: ui::ScrollEvent instances come from the touchpad.
156 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( 164 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
157 ui::ScrollEvent* event) { 165 ui::ScrollEvent* event) {
158 WebKit::WebGestureEvent webkit_event; 166 WebKit::WebGestureEvent webkit_event;
159 167
160 switch (event->type()) { 168 switch (event->type()) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 } 230 }
223 231
224 webkit_event.setKeyIdentifierFromWindowsKeyCode(); 232 webkit_event.setKeyIdentifierFromWindowsKeyCode();
225 233
226 // TODO: IsAutoRepeat/IsKeyPad? 234 // TODO: IsAutoRepeat/IsKeyPad?
227 235
228 return webkit_event; 236 return webkit_event;
229 } 237 }
230 238
231 } // namespace content 239 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698