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

Side by Side Diff: ui/events/blink/web_input_event.cc

Issue 2655303004: Add id properties to PointerEvent (Closed)
Patch Set: pointer id Created 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ui/events/blink/web_input_event.h" 5 #include "ui/events/blink/web_input_event.h"
6 6
7 #include "ui/events/base_event_utils.h" 7 #include "ui/events/base_event_utils.h"
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 #include "ui/events/blink/blink_features.h" 9 #include "ui/events/blink/blink_features.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 webkit_event.button = blink::WebMouseEvent::Button::Middle; 422 webkit_event.button = blink::WebMouseEvent::Button::Middle;
423 if (button_flags & EF_RIGHT_MOUSE_BUTTON) 423 if (button_flags & EF_RIGHT_MOUSE_BUTTON)
424 webkit_event.button = blink::WebMouseEvent::Button::Right; 424 webkit_event.button = blink::WebMouseEvent::Button::Right;
425 425
426 webkit_event.clickCount = click_count; 426 webkit_event.clickCount = click_count;
427 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 427 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
428 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 428 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
429 webkit_event.force = event.pointer_details().force; 429 webkit_event.force = event.pointer_details().force;
430 webkit_event.tangentialPressure = event.pointer_details().tangential_pressure; 430 webkit_event.tangentialPressure = event.pointer_details().tangential_pressure;
431 webkit_event.twist = event.pointer_details().twist; 431 webkit_event.twist = event.pointer_details().twist;
432 webkit_event.id = event.pointer_details().id;
432 webkit_event.pointerType = 433 webkit_event.pointerType =
433 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 434 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
434 435
435 return webkit_event; 436 return webkit_event;
436 } 437 }
437 438
438 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent( 439 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
439 const MouseWheelEvent& event) { 440 const MouseWheelEvent& event) {
440 blink::WebMouseWheelEvent webkit_event( 441 blink::WebMouseWheelEvent webkit_event(
441 blink::WebInputEvent::MouseWheel, 442 blink::WebInputEvent::MouseWheel,
(...skipping 11 matching lines...) Expand all
453 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 454 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
454 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 455 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
455 webkit_event.force = event.pointer_details().force; 456 webkit_event.force = event.pointer_details().force;
456 webkit_event.pointerType = 457 webkit_event.pointerType =
457 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 458 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
458 459
459 return webkit_event; 460 return webkit_event;
460 } 461 }
461 462
462 } // namespace ui 463 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698