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

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

Issue 8907005: Add support for new scroll valuators coming from CMT (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits Created 9 years 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/web_input_event_aura.cc ('k') | ui/aura/event.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 webkit_event.type = WebKit::WebInputEvent::MouseWheel; 266 webkit_event.type = WebKit::WebInputEvent::MouseWheel;
267 webkit_event.button = WebKit::WebMouseEvent::ButtonNone; 267 webkit_event.button = WebKit::WebMouseEvent::ButtonNone;
268 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 268 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
269 webkit_event.timeStampSeconds = event->time_stamp().ToDoubleT(); 269 webkit_event.timeStampSeconds = event->time_stamp().ToDoubleT();
270 webkit_event.deltaY = ui::GetMouseWheelOffset(event->native_event()); 270 webkit_event.deltaY = ui::GetMouseWheelOffset(event->native_event());
271 webkit_event.wheelTicksY = webkit_event.deltaY > 0 ? 1 : -1; 271 webkit_event.wheelTicksY = webkit_event.deltaY > 0 ? 1 : -1;
272 272
273 return webkit_event; 273 return webkit_event;
274 } 274 }
275 275
276 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
277 aura::ScrollEvent* event) {
278 WebKit::WebMouseWheelEvent webkit_event;
279
280 webkit_event.type = WebKit::WebInputEvent::MouseWheel;
281 webkit_event.button = WebKit::WebMouseEvent::ButtonNone;
282 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
283 webkit_event.timeStampSeconds = event->time_stamp().ToDoubleT();
284 // TODO(davemoore) Support X offset, once cmt generates better data.
285 if (abs(event->y_offset()) >= 1) {
286 webkit_event.deltaY = event->y_offset();
287 webkit_event.wheelTicksY = webkit_event.deltaY > 0 ? 1 : -1;
288 }
289
290 return webkit_event;
291 }
292
276 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( 293 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
277 aura::KeyEvent* event) { 294 aura::KeyEvent* event) {
278 base::NativeEvent native_event = event->native_event(); 295 base::NativeEvent native_event = event->native_event();
279 WebKit::WebKeyboardEvent webkit_event; 296 WebKit::WebKeyboardEvent webkit_event;
280 XKeyEvent* native_key_event = &native_event->xkey; 297 XKeyEvent* native_key_event = &native_event->xkey;
281 298
282 webkit_event.timeStampSeconds = 299 webkit_event.timeStampSeconds =
283 XEventTimeToWebEventTime(native_key_event->time); 300 XEventTimeToWebEventTime(native_key_event->time);
284 webkit_event.modifiers = XStateToWebEventModifiers(native_key_event->state); 301 webkit_event.modifiers = XStateToWebEventModifiers(native_key_event->state);
285 302
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 } 402 }
386 403
387 // Update the type of the touch event. 404 // Update the type of the touch event.
388 web_event->type = TouchEventTypeFromEvent(event); 405 web_event->type = TouchEventTypeFromEvent(event);
389 web_event->timeStampSeconds = event->time_stamp().ToDoubleT(); 406 web_event->timeStampSeconds = event->time_stamp().ToDoubleT();
390 407
391 return point; 408 return point;
392 } 409 }
393 410
394 } // namespace content 411 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | ui/aura/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698