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

Unified Diff: ui/events/mojo/struct_traits_unittest.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, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/mojo/event_struct_traits.cc ('k') | ui/views/mus/pointer_watcher_event_router_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/mojo/struct_traits_unittest.cc
diff --git a/ui/events/mojo/struct_traits_unittest.cc b/ui/events/mojo/struct_traits_unittest.cc
index 5cc64e09a39e5452f675c0e39aa74ee32f080c70..62b9649e13bd798f8bfaee66bcca94a3808ad9f2 100644
--- a/ui/events/mojo/struct_traits_unittest.cc
+++ b/ui/events/mojo/struct_traits_unittest.cc
@@ -163,27 +163,28 @@ TEST_F(StructTraitsTest, PointerEvent) {
PointerEvent kTestData[] = {
// Mouse pointer events:
{ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE,
- PointerEvent::kMousePointerId,
+ PointerEvent::kMousePointerId, 0,
PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
{ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
EF_LEFT_MOUSE_BUTTON, PointerEvent::kMousePointerId,
+ EF_LEFT_MOUSE_BUTTON,
PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
{ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30),
EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
- PointerEvent::kMousePointerId,
+ PointerEvent::kMousePointerId, EF_RIGHT_MOUSE_BUTTON,
PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
{ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30),
- EF_BACK_MOUSE_BUTTON, PointerEvent::kMousePointerId,
+ EF_BACK_MOUSE_BUTTON, PointerEvent::kMousePointerId, 0,
PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
// Touch pointer events:
- {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 1,
+ {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 1, 0,
PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 1.0, 2.0, 3.0, 4.0,
5.0),
base::TimeTicks()},
{ET_POINTER_CANCELLED, gfx::Point(120, 120), gfx::Point(2, 3), EF_NONE, 2,
- PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 5.5, 4.5, 3.5, 2.5,
- 0.5),
+ 0, PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 5.5, 4.5, 3.5,
+ 2.5, 0.5),
base::TimeTicks()},
};
@@ -199,6 +200,8 @@ TEST_F(StructTraitsTest, PointerEvent) {
EXPECT_EQ(kTestData[i].location(), output_ptr_event->location());
EXPECT_EQ(kTestData[i].root_location(), output_ptr_event->root_location());
EXPECT_EQ(kTestData[i].pointer_id(), output_ptr_event->pointer_id());
+ EXPECT_EQ(kTestData[i].changed_button_flags(),
+ output_ptr_event->changed_button_flags());
EXPECT_EQ(kTestData[i].pointer_details(),
output_ptr_event->pointer_details());
}
« no previous file with comments | « ui/events/mojo/event_struct_traits.cc ('k') | ui/views/mus/pointer_watcher_event_router_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698