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

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

Issue 2849083002: Add pointer id to the WebMouseEvent's constructors (Closed)
Patch Set: webmouseid Created 3 years, 7 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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 case ET_MOUSE_DRAGGED: 411 case ET_MOUSE_DRAGGED:
412 type = blink::WebInputEvent::kMouseMove; 412 type = blink::WebInputEvent::kMouseMove;
413 break; 413 break;
414 default: 414 default:
415 NOTIMPLEMENTED() << "Received unexpected event: " << event.type(); 415 NOTIMPLEMENTED() << "Received unexpected event: " << event.type();
416 break; 416 break;
417 } 417 }
418 418
419 blink::WebMouseEvent webkit_event( 419 blink::WebMouseEvent webkit_event(
420 type, EventFlagsToWebEventModifiers(event.flags()), 420 type, EventFlagsToWebEventModifiers(event.flags()),
421 EventTimeStampToSeconds(event.time_stamp())); 421 EventTimeStampToSeconds(event.time_stamp()), event.pointer_details().id);
422 webkit_event.button = blink::WebMouseEvent::Button::kNoButton; 422 webkit_event.button = blink::WebMouseEvent::Button::kNoButton;
423 int button_flags = event.flags(); 423 int button_flags = event.flags();
424 if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) { 424 if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) {
425 // We want to use changed_button_flags() for mouse pressed & released. 425 // We want to use changed_button_flags() for mouse pressed & released.
426 // These flags can be used only if they are set which is not always the case 426 // These flags can be used only if they are set which is not always the case
427 // (see e.g. GetChangedMouseButtonFlagsFromNative() in events_win.cc). 427 // (see e.g. GetChangedMouseButtonFlagsFromNative() in events_win.cc).
428 if (event.changed_button_flags()) 428 if (event.changed_button_flags())
429 button_flags = event.changed_button_flags(); 429 button_flags = event.changed_button_flags();
430 } 430 }
431 431
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 webkit_event.tilt_x = roundf(event.pointer_details().tilt_x); 477 webkit_event.tilt_x = roundf(event.pointer_details().tilt_x);
478 webkit_event.tilt_y = roundf(event.pointer_details().tilt_y); 478 webkit_event.tilt_y = roundf(event.pointer_details().tilt_y);
479 webkit_event.force = event.pointer_details().force; 479 webkit_event.force = event.pointer_details().force;
480 webkit_event.pointer_type = 480 webkit_event.pointer_type =
481 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 481 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
482 482
483 return webkit_event; 483 return webkit_event;
484 } 484 }
485 485
486 } // namespace ui 486 } // namespace ui
OLDNEW
« no previous file with comments | « third_party/WebKit/public/platform/WebTouchPoint.h ('k') | ui/events/blink/web_input_event_builders_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698