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

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

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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_rewriter_unittest.cc ('k') | ui/events/event_utils.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) 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 TEST(EventTest, RepeatedClick) { 84 TEST(EventTest, RepeatedClick) {
85 const gfx::Point origin(0, 0); 85 const gfx::Point origin(0, 0);
86 MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 86 MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
87 0); 87 0);
88 MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 88 MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
89 0); 89 0);
90 LocatedEventTestApi test_ev1(&mouse_ev1); 90 LocatedEventTestApi test_ev1(&mouse_ev1);
91 LocatedEventTestApi test_ev2(&mouse_ev2); 91 LocatedEventTestApi test_ev2(&mouse_ev2);
92 92
93 base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); 93 base::TimeTicks start = base::TimeTicks();
94 base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); 94 base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
95 base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000); 95 base::TimeTicks later = start + base::TimeDelta::FromMilliseconds(1000);
96 96
97 // Same event. 97 // Same event.
98 test_ev1.set_location(gfx::Point(0, 0)); 98 test_ev1.set_location(gfx::Point(0, 0));
99 test_ev2.set_location(gfx::Point(1, 0)); 99 test_ev2.set_location(gfx::Point(1, 0));
100 test_ev1.set_time_stamp(start); 100 test_ev1.set_time_stamp(start);
101 test_ev2.set_time_stamp(start); 101 test_ev2.set_time_stamp(start);
102 EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2)); 102 EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
103 MouseEvent mouse_ev3(mouse_ev1); 103 MouseEvent mouse_ev3(mouse_ev1);
104 EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev3)); 104 EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev3));
105 105
(...skipping 20 matching lines...) Expand all
126 } 126 }
127 127
128 // Tests that an event only increases the click count and gets marked as a 128 // Tests that an event only increases the click count and gets marked as a
129 // double click if a release event was seen for the previous click. This 129 // double click if a release event was seen for the previous click. This
130 // prevents the same PRESSED event from being processed twice: 130 // prevents the same PRESSED event from being processed twice:
131 // http://crbug.com/389162 131 // http://crbug.com/389162
132 TEST(EventTest, DoubleClickRequiresRelease) { 132 TEST(EventTest, DoubleClickRequiresRelease) {
133 const gfx::Point origin1(0, 0); 133 const gfx::Point origin1(0, 0);
134 const gfx::Point origin2(100, 0); 134 const gfx::Point origin2(100, 0);
135 std::unique_ptr<MouseEvent> ev; 135 std::unique_ptr<MouseEvent> ev;
136 base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); 136 base::TimeTicks start = base::TimeTicks();
137 base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); 137 base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
138 138
139 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(), 139 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
140 0, 0)); 140 0, 0));
141 ev->set_time_stamp(start); 141 ev->set_time_stamp(start);
142 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev)); 142 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
143 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(), 143 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
144 0, 0)); 144 0, 0));
145 ev->set_time_stamp(start); 145 ev->set_time_stamp(start);
146 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev)); 146 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
147 147
(...skipping 14 matching lines...) Expand all
162 ev->set_time_stamp(soon); 162 ev->set_time_stamp(soon);
163 EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev)); 163 EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
164 MouseEvent::ResetLastClickForTest(); 164 MouseEvent::ResetLastClickForTest();
165 } 165 }
166 166
167 // Tests that clicking right and then left clicking does not generate a double 167 // Tests that clicking right and then left clicking does not generate a double
168 // click. 168 // click.
169 TEST(EventTest, SingleClickRightLeft) { 169 TEST(EventTest, SingleClickRightLeft) {
170 const gfx::Point origin(0, 0); 170 const gfx::Point origin(0, 0);
171 std::unique_ptr<MouseEvent> ev; 171 std::unique_ptr<MouseEvent> ev;
172 base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); 172 base::TimeTicks start = base::TimeTicks();
173 base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); 173 base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
174 174
175 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 175 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
176 ui::EF_RIGHT_MOUSE_BUTTON, 176 ui::EF_RIGHT_MOUSE_BUTTON,
177 ui::EF_RIGHT_MOUSE_BUTTON)); 177 ui::EF_RIGHT_MOUSE_BUTTON));
178 ev->set_time_stamp(start); 178 ev->set_time_stamp(start);
179 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev)); 179 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
180 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 180 ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
181 ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON)); 181 ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
182 ev->set_time_stamp(start); 182 ev->set_time_stamp(start);
183 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev)); 183 EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 EXPECT_FALSE(key_a1.is_repeat()); 561 EXPECT_FALSE(key_a1.is_repeat());
562 562
563 KeyEvent key_a1_with_same_event(native_event_a_pressed); 563 KeyEvent key_a1_with_same_event(native_event_a_pressed);
564 EXPECT_FALSE(key_a1_with_same_event.is_repeat()); 564 EXPECT_FALSE(key_a1_with_same_event.is_repeat());
565 } 565 }
566 #endif 566 #endif
567 } 567 }
568 #endif // USE_X11 || OS_WIN 568 #endif // USE_X11 || OS_WIN
569 569
570 TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) { 570 TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
571 const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0); 571 const base::TimeTicks time = base::TimeTicks();
572 const float non_zero_length1 = 30; 572 const float non_zero_length1 = 30;
573 const float non_zero_length2 = 46; 573 const float non_zero_length2 = 46;
574 574
575 TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time, 575 TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
576 non_zero_length1, 0, 0, 0); 576 non_zero_length1, 0, 0, 0);
577 EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_x); 577 EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_x);
578 EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_y); 578 EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_y);
579 579
580 TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time, 580 TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
581 0, non_zero_length2, 0, 0); 581 0, non_zero_length2, 0, 0);
582 EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_x); 582 EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_x);
583 EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_y); 583 EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_y);
584 } 584 }
585 585
586 TEST(EventTest, TouchEventRotationAngleFixing) { 586 TEST(EventTest, TouchEventRotationAngleFixing) {
587 const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0); 587 const base::TimeTicks time = base::TimeTicks();
588 const float radius_x = 20; 588 const float radius_x = 20;
589 const float radius_y = 10; 589 const float radius_y = 10;
590 590
591 { 591 {
592 const float angle_in_range = 0; 592 const float angle_in_range = 0;
593 TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time, 593 TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
594 radius_x, radius_y, angle_in_range, 0); 594 radius_x, radius_y, angle_in_range, 0);
595 EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle()); 595 EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle());
596 } 596 }
597 597
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 EXPECT_EQ(-45.0f, touch_event.pointer_details().tilt_y); 727 EXPECT_EQ(-45.0f, touch_event.pointer_details().tilt_y);
728 EXPECT_EQ(5.0f, touch_event.pointer_details().radius_x); 728 EXPECT_EQ(5.0f, touch_event.pointer_details().radius_x);
729 EXPECT_EQ(6.0f, touch_event.pointer_details().radius_y); 729 EXPECT_EQ(6.0f, touch_event.pointer_details().radius_y);
730 730
731 ui::TouchEvent touch_event_copy(touch_event); 731 ui::TouchEvent touch_event_copy(touch_event);
732 EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details()); 732 EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details());
733 } 733 }
734 734
735 TEST(EventTest, PointerEventCanConvertFrom) { 735 TEST(EventTest, PointerEventCanConvertFrom) {
736 const gfx::Point point; 736 const gfx::Point point;
737 const base::TimeDelta time; 737 const base::TimeTicks time;
738 738
739 // Common mouse events can be converted. 739 // Common mouse events can be converted.
740 const EventType mouse_allowed[] = { 740 const EventType mouse_allowed[] = {
741 ET_MOUSE_PRESSED, 741 ET_MOUSE_PRESSED,
742 ET_MOUSE_DRAGGED, 742 ET_MOUSE_DRAGGED,
743 ET_MOUSE_MOVED, 743 ET_MOUSE_MOVED,
744 ET_MOUSE_ENTERED, 744 ET_MOUSE_ENTERED,
745 ET_MOUSE_EXITED, 745 ET_MOUSE_EXITED,
746 ET_MOUSE_RELEASED 746 ET_MOUSE_RELEASED
747 }; 747 };
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 }; 789 };
790 const ui::EventType kTouchTypeMap[][2] = { 790 const ui::EventType kTouchTypeMap[][2] = {
791 {ui::ET_TOUCH_PRESSED, ui::ET_POINTER_DOWN}, 791 {ui::ET_TOUCH_PRESSED, ui::ET_POINTER_DOWN},
792 {ui::ET_TOUCH_MOVED, ui::ET_POINTER_MOVED}, 792 {ui::ET_TOUCH_MOVED, ui::ET_POINTER_MOVED},
793 {ui::ET_TOUCH_RELEASED, ui::ET_POINTER_UP}, 793 {ui::ET_TOUCH_RELEASED, ui::ET_POINTER_UP},
794 {ui::ET_TOUCH_CANCELLED, ui::ET_POINTER_CANCELLED}, 794 {ui::ET_TOUCH_CANCELLED, ui::ET_POINTER_CANCELLED},
795 }; 795 };
796 796
797 for (size_t i = 0; i < arraysize(kMouseTypeMap); i++) { 797 for (size_t i = 0; i < arraysize(kMouseTypeMap); i++) {
798 ui::MouseEvent mouse_event(kMouseTypeMap[i][0], gfx::Point(0, 0), 798 ui::MouseEvent mouse_event(kMouseTypeMap[i][0], gfx::Point(0, 0),
799 gfx::Point(0, 0), base::TimeDelta(), 0, 0); 799 gfx::Point(0, 0), base::TimeTicks(), 0, 0);
800 ui::PointerEvent pointer_event(mouse_event); 800 ui::PointerEvent pointer_event(mouse_event);
801 EXPECT_EQ(kMouseTypeMap[i][1], pointer_event.type()); 801 EXPECT_EQ(kMouseTypeMap[i][1], pointer_event.type());
802 EXPECT_FALSE(pointer_event.IsMouseEvent()); 802 EXPECT_FALSE(pointer_event.IsMouseEvent());
803 EXPECT_FALSE(pointer_event.IsTouchEvent()); 803 EXPECT_FALSE(pointer_event.IsTouchEvent());
804 EXPECT_TRUE(pointer_event.IsPointerEvent()); 804 EXPECT_TRUE(pointer_event.IsPointerEvent());
805 } 805 }
806 806
807 for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) { 807 for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) {
808 ui::TouchEvent touch_event(kTouchTypeMap[i][0], gfx::Point(0, 0), 0, 808 ui::TouchEvent touch_event(kTouchTypeMap[i][0], gfx::Point(0, 0), 0,
809 base::TimeDelta()); 809 base::TimeTicks());
810 ui::PointerEvent pointer_event(touch_event); 810 ui::PointerEvent pointer_event(touch_event);
811 EXPECT_EQ(kTouchTypeMap[i][1], pointer_event.type()); 811 EXPECT_EQ(kTouchTypeMap[i][1], pointer_event.type());
812 EXPECT_FALSE(pointer_event.IsMouseEvent()); 812 EXPECT_FALSE(pointer_event.IsMouseEvent());
813 EXPECT_FALSE(pointer_event.IsTouchEvent()); 813 EXPECT_FALSE(pointer_event.IsTouchEvent());
814 EXPECT_TRUE(pointer_event.IsPointerEvent()); 814 EXPECT_TRUE(pointer_event.IsPointerEvent());
815 } 815 }
816 } 816 }
817 817
818 TEST(EventTest, PointerEventId) { 818 TEST(EventTest, PointerEventId) {
819 { 819 {
820 ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), 820 ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
821 gfx::Point(0, 0), base::TimeDelta(), 0, 0); 821 gfx::Point(0, 0), base::TimeTicks(), 0, 0);
822 ui::PointerEvent pointer_event(mouse_event); 822 ui::PointerEvent pointer_event(mouse_event);
823 EXPECT_EQ(pointer_event.pointer_id(), ui::PointerEvent::kMousePointerId); 823 EXPECT_EQ(pointer_event.pointer_id(), ui::PointerEvent::kMousePointerId);
824 } 824 }
825 825
826 for (int touch_id = 0; touch_id < 8; touch_id++) { 826 for (int touch_id = 0; touch_id < 8; touch_id++) {
827 ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), touch_id, 827 ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), touch_id,
828 base::TimeDelta()); 828 base::TimeTicks());
829 ui::PointerEvent pointer_event(touch_event); 829 ui::PointerEvent pointer_event(touch_event);
830 EXPECT_EQ(pointer_event.pointer_id(), touch_id); 830 EXPECT_EQ(pointer_event.pointer_id(), touch_id);
831 } 831 }
832 } 832 }
833 833
834 TEST(EventTest, PointerDetailsPointer) { 834 TEST(EventTest, PointerDetailsPointer) {
835 const float kRadiusX = 10.0f; 835 const float kRadiusX = 10.0f;
836 const float kRadiusY = 5.0f; 836 const float kRadiusY = 5.0f;
837 const float kForce = 15.0f; 837 const float kForce = 15.0f;
838 ui::TouchEvent touch_event(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, 838 ui::TouchEvent touch_event(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0,
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 {ui::ET_POINTER_EXITED, ui::ET_MOUSE_EXITED, gfx::Point(5, 1), 925 {ui::ET_POINTER_EXITED, ui::ET_MOUSE_EXITED, gfx::Point(5, 1),
926 gfx::Point(1, 5), EF_RIGHT_MOUSE_BUTTON}, 926 gfx::Point(1, 5), EF_RIGHT_MOUSE_BUTTON},
927 {ui::ET_POINTER_UP, ui::ET_MOUSE_RELEASED, gfx::Point(1000, 1000), 927 {ui::ET_POINTER_UP, ui::ET_MOUSE_RELEASED, gfx::Point(1000, 1000),
928 gfx::Point(14, 15), EF_MIDDLE_MOUSE_BUTTON}}; 928 gfx::Point(14, 15), EF_MIDDLE_MOUSE_BUTTON}};
929 929
930 for (size_t i = 0; i < arraysize(kTestData); i++) { 930 for (size_t i = 0; i < arraysize(kTestData); i++) {
931 ui::PointerEvent pointer_event( 931 ui::PointerEvent pointer_event(
932 kTestData[i].in_type, kTestData[i].location, kTestData[i].root_location, 932 kTestData[i].in_type, kTestData[i].location, kTestData[i].root_location,
933 kTestData[i].flags, 0, 933 kTestData[i].flags, 0,
934 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), 934 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
935 base::TimeDelta()); 935 base::TimeTicks());
936 ui::MouseEvent mouse_event(pointer_event); 936 ui::MouseEvent mouse_event(pointer_event);
937 937
938 EXPECT_EQ(kTestData[i].out_type, mouse_event.type()); 938 EXPECT_EQ(kTestData[i].out_type, mouse_event.type());
939 EXPECT_EQ(kTestData[i].location, mouse_event.location()); 939 EXPECT_EQ(kTestData[i].location, mouse_event.location());
940 EXPECT_EQ(kTestData[i].root_location, mouse_event.root_location()); 940 EXPECT_EQ(kTestData[i].root_location, mouse_event.root_location());
941 EXPECT_EQ(kTestData[i].flags, mouse_event.flags()); 941 EXPECT_EQ(kTestData[i].flags, mouse_event.flags());
942 } 942 }
943 } 943 }
944 944
945 TEST(EventTest, PointerEventToTouchEventType) { 945 TEST(EventTest, PointerEventToTouchEventType) {
946 ui::EventType kTouchTypeMap[][2] = { 946 ui::EventType kTouchTypeMap[][2] = {
947 {ui::ET_POINTER_DOWN, ui::ET_TOUCH_PRESSED}, 947 {ui::ET_POINTER_DOWN, ui::ET_TOUCH_PRESSED},
948 {ui::ET_POINTER_MOVED, ui::ET_TOUCH_MOVED}, 948 {ui::ET_POINTER_MOVED, ui::ET_TOUCH_MOVED},
949 {ui::ET_POINTER_UP, ui::ET_TOUCH_RELEASED}, 949 {ui::ET_POINTER_UP, ui::ET_TOUCH_RELEASED},
950 {ui::ET_POINTER_CANCELLED, ui::ET_TOUCH_CANCELLED}, 950 {ui::ET_POINTER_CANCELLED, ui::ET_TOUCH_CANCELLED},
951 }; 951 };
952 952
953 for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) { 953 for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) {
954 ui::PointerEvent pointer_event( 954 ui::PointerEvent pointer_event(
955 kTouchTypeMap[i][0], gfx::Point(), gfx::Point(), 0, 0, 955 kTouchTypeMap[i][0], gfx::Point(), gfx::Point(), 0, 0,
956 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), 956 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
957 base::TimeDelta()); 957 base::TimeTicks());
958 ui::TouchEvent touch_event(pointer_event); 958 ui::TouchEvent touch_event(pointer_event);
959 959
960 EXPECT_EQ(kTouchTypeMap[i][1], touch_event.type()); 960 EXPECT_EQ(kTouchTypeMap[i][1], touch_event.type());
961 } 961 }
962 } 962 }
963 963
964 TEST(EventTest, PointerEventToTouchEventDetails) { 964 TEST(EventTest, PointerEventToTouchEventDetails) {
965 ui::PointerEvent pointer_event( 965 ui::PointerEvent pointer_event(
966 ui::TouchEvent(ui::ET_TOUCH_PRESSED, gfx::Point(12, 14), 0, 15, 966 ui::TouchEvent(ui::ET_TOUCH_PRESSED, gfx::Point(12, 14), 0, 15,
967 EventTimeForNow(), 11.5, 13.5, 13.0, 0.5)); 967 EventTimeForNow(), 11.5, 13.5, 13.0, 0.5));
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 XButtonEvent* button_event = &(native_event.xbutton); 1020 XButtonEvent* button_event = &(native_event.xbutton);
1021 button_event->type = ButtonPress; 1021 button_event->type = ButtonPress;
1022 button_event->button = 4; // A valid wheel button number between min and max. 1022 button_event->button = 4; // A valid wheel button number between min and max.
1023 MouseWheelEvent mouse_ev(&native_event); 1023 MouseWheelEvent mouse_ev(&native_event);
1024 1024
1025 histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1); 1025 histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
1026 #endif 1026 #endif
1027 } 1027 }
1028 1028
1029 } // namespace ui 1029 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event_rewriter_unittest.cc ('k') | ui/events/event_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698