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

Side by Side Diff: ui/events/event.cc

Issue 2270143002: ui/events: Add changed_button_flags_ in ui::PointerEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_unittest.cc » ('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) 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 "ui/events/event.h" 5 #include "ui/events/event.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 10
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 latency()->AddLatencyNumberWithTimestamp( 457 latency()->AddLatencyNumberWithTimestamp(
458 INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0, 458 INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0,
459 base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()), 1); 459 base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()), 1);
460 latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0); 460 latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
461 if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED) 461 if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED)
462 SetClickCount(GetRepeatCount(*this)); 462 SetClickCount(GetRepeatCount(*this));
463 } 463 }
464 464
465 MouseEvent::MouseEvent(const PointerEvent& pointer_event) 465 MouseEvent::MouseEvent(const PointerEvent& pointer_event)
466 : LocatedEvent(pointer_event), 466 : LocatedEvent(pointer_event),
467 changed_button_flags_(0), 467 changed_button_flags_(pointer_event.changed_button_flags()),
468 pointer_details_(pointer_event.pointer_details()) { 468 pointer_details_(pointer_event.pointer_details()) {
469 DCHECK(pointer_event.IsMousePointerEvent()); 469 DCHECK(pointer_event.IsMousePointerEvent());
470 switch (pointer_event.type()) { 470 switch (pointer_event.type()) {
471 case ET_POINTER_DOWN: 471 case ET_POINTER_DOWN:
472 SetType(ET_MOUSE_PRESSED); 472 SetType(ET_MOUSE_PRESSED);
473 break; 473 break;
474 474
475 case ET_POINTER_MOVED: 475 case ET_POINTER_MOVED:
476 if (pointer_event.flags() & 476 if (pointer_event.flags() &
477 (EF_LEFT_MOUSE_BUTTON | EF_MIDDLE_MOUSE_BUTTON | 477 (EF_LEFT_MOUSE_BUTTON | EF_MIDDLE_MOUSE_BUTTON |
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 case ET_TOUCH_CANCELLED: 851 case ET_TOUCH_CANCELLED:
852 return true; 852 return true;
853 default: 853 default:
854 return false; 854 return false;
855 } 855 }
856 } 856 }
857 857
858 PointerEvent::PointerEvent(const PointerEvent& pointer_event) 858 PointerEvent::PointerEvent(const PointerEvent& pointer_event)
859 : LocatedEvent(pointer_event), 859 : LocatedEvent(pointer_event),
860 pointer_id_(pointer_event.pointer_id()), 860 pointer_id_(pointer_event.pointer_id()),
861 changed_button_flags_(pointer_event.changed_button_flags()),
861 details_(pointer_event.pointer_details()) {} 862 details_(pointer_event.pointer_details()) {}
862 863
863 PointerEvent::PointerEvent(const MouseEvent& mouse_event) 864 PointerEvent::PointerEvent(const MouseEvent& mouse_event)
864 : LocatedEvent(mouse_event), 865 : LocatedEvent(mouse_event),
865 pointer_id_(kMousePointerId), 866 pointer_id_(kMousePointerId),
867 changed_button_flags_(mouse_event.changed_button_flags()),
866 details_(mouse_event.pointer_details()) { 868 details_(mouse_event.pointer_details()) {
867 DCHECK(CanConvertFrom(mouse_event)); 869 DCHECK(CanConvertFrom(mouse_event));
868 switch (mouse_event.type()) { 870 switch (mouse_event.type()) {
869 case ET_MOUSE_PRESSED: 871 case ET_MOUSE_PRESSED:
870 SetType(ET_POINTER_DOWN); 872 SetType(ET_POINTER_DOWN);
871 break; 873 break;
872 874
873 case ET_MOUSE_DRAGGED: 875 case ET_MOUSE_DRAGGED:
874 case ET_MOUSE_MOVED: 876 case ET_MOUSE_MOVED:
875 SetType(ET_POINTER_MOVED); 877 SetType(ET_POINTER_MOVED);
(...skipping 12 matching lines...) Expand all
888 break; 890 break;
889 891
890 default: 892 default:
891 NOTREACHED(); 893 NOTREACHED();
892 } 894 }
893 } 895 }
894 896
895 PointerEvent::PointerEvent(const TouchEvent& touch_event) 897 PointerEvent::PointerEvent(const TouchEvent& touch_event)
896 : LocatedEvent(touch_event), 898 : LocatedEvent(touch_event),
897 pointer_id_(touch_event.touch_id()), 899 pointer_id_(touch_event.touch_id()),
900 changed_button_flags_(0),
898 details_(touch_event.pointer_details()) { 901 details_(touch_event.pointer_details()) {
899 DCHECK(CanConvertFrom(touch_event)); 902 DCHECK(CanConvertFrom(touch_event));
900 switch (touch_event.type()) { 903 switch (touch_event.type()) {
901 case ET_TOUCH_PRESSED: 904 case ET_TOUCH_PRESSED:
902 SetType(ET_POINTER_DOWN); 905 SetType(ET_POINTER_DOWN);
903 break; 906 break;
904 907
905 case ET_TOUCH_MOVED: 908 case ET_TOUCH_MOVED:
906 SetType(ET_POINTER_MOVED); 909 SetType(ET_POINTER_MOVED);
907 break; 910 break;
908 911
909 case ET_TOUCH_RELEASED: 912 case ET_TOUCH_RELEASED:
910 SetType(ET_POINTER_UP); 913 SetType(ET_POINTER_UP);
911 break; 914 break;
912 915
913 case ET_TOUCH_CANCELLED: 916 case ET_TOUCH_CANCELLED:
914 SetType(ET_POINTER_CANCELLED); 917 SetType(ET_POINTER_CANCELLED);
915 break; 918 break;
916 919
917 default: 920 default:
918 NOTREACHED(); 921 NOTREACHED();
919 } 922 }
920 } 923 }
921 924
922 PointerEvent::PointerEvent(EventType type, 925 PointerEvent::PointerEvent(EventType type,
923 const gfx::Point& location, 926 const gfx::Point& location,
924 const gfx::Point& root_location, 927 const gfx::Point& root_location,
925 int flags, 928 int flags,
926 int pointer_id, 929 int pointer_id,
930 int changed_button_flags,
927 const PointerDetails& pointer_details, 931 const PointerDetails& pointer_details,
928 base::TimeTicks time_stamp) 932 base::TimeTicks time_stamp)
929 : LocatedEvent(type, 933 : LocatedEvent(type,
930 gfx::PointF(location), 934 gfx::PointF(location),
931 gfx::PointF(root_location), 935 gfx::PointF(root_location),
932 time_stamp, 936 time_stamp,
933 flags), 937 flags),
934 pointer_id_(pointer_id), 938 pointer_id_(pointer_id),
939 changed_button_flags_(changed_button_flags),
935 details_(pointer_details) {} 940 details_(pointer_details) {}
936 941
937 const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max(); 942 const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
938 943
939 //////////////////////////////////////////////////////////////////////////////// 944 ////////////////////////////////////////////////////////////////////////////////
940 // KeyEvent 945 // KeyEvent
941 946
942 // static 947 // static
943 KeyEvent* KeyEvent::last_key_event_ = NULL; 948 KeyEvent* KeyEvent::last_key_event_ = NULL;
944 949
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 gfx::PointF(x, y), 1277 gfx::PointF(x, y),
1273 time_stamp, 1278 time_stamp,
1274 flags | EF_FROM_TOUCH), 1279 flags | EF_FROM_TOUCH),
1275 details_(details), 1280 details_(details),
1276 unique_touch_event_id_(unique_touch_event_id) {} 1281 unique_touch_event_id_(unique_touch_event_id) {}
1277 1282
1278 GestureEvent::~GestureEvent() { 1283 GestureEvent::~GestureEvent() {
1279 } 1284 }
1280 1285
1281 } // namespace ui 1286 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698