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

Unified Diff: ui/ozone/platform/wayland/wayland_pointer_unittest.cc

Issue 2374213003: Refactored static_cast'ing of events to use the AsXXXEvent() methods. (Closed)
Patch Set: Added IsCancelModeEvent() & AsCancelModeEvent() methods to Event Created 4 years, 2 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
Index: ui/ozone/platform/wayland/wayland_pointer_unittest.cc
diff --git a/ui/ozone/platform/wayland/wayland_pointer_unittest.cc b/ui/ozone/platform/wayland/wayland_pointer_unittest.cc
index 3d0c13780dd8047efb7874cf58a55c918414e6e7..19dbc20f817af83487d01df5b453369e3b3228ae 100644
--- a/ui/ozone/platform/wayland/wayland_pointer_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_pointer_unittest.cc
@@ -86,7 +86,7 @@ TEST_F(WaylandPointerTest, Motion) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseEvent());
- auto mouse_event = static_cast<MouseEvent*>(event.get());
+ auto mouse_event = event->AsMouseEvent();
EXPECT_EQ(ET_MOUSE_MOVED, mouse_event->type());
EXPECT_EQ(0, mouse_event->button_flags());
EXPECT_EQ(0, mouse_event->changed_button_flags());
@@ -112,7 +112,7 @@ TEST_F(WaylandPointerTest, MotionDragged) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseEvent());
- auto mouse_event = static_cast<MouseEvent*>(event.get());
+ auto mouse_event = event->AsMouseEvent();
EXPECT_EQ(ET_MOUSE_DRAGGED, mouse_event->type());
EXPECT_EQ(EF_MIDDLE_MOUSE_BUTTON, mouse_event->button_flags());
EXPECT_EQ(0, mouse_event->changed_button_flags());
@@ -137,7 +137,7 @@ TEST_F(WaylandPointerTest, ButtonPress) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseEvent());
- auto mouse_event = static_cast<MouseEvent*>(event.get());
+ auto mouse_event = event->AsMouseEvent();
EXPECT_EQ(ET_MOUSE_PRESSED, mouse_event->type());
EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
mouse_event->button_flags());
@@ -165,7 +165,7 @@ TEST_F(WaylandPointerTest, ButtonRelease) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseEvent());
- auto mouse_event = static_cast<MouseEvent*>(event.get());
+ auto mouse_event = event->AsMouseEvent();
EXPECT_EQ(ET_MOUSE_RELEASED, mouse_event->type());
EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_BACK_MOUSE_BUTTON,
mouse_event->button_flags());
@@ -192,7 +192,7 @@ TEST_F(WaylandPointerTest, AxisVertical) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseWheelEvent());
- auto mouse_wheel_event = static_cast<MouseWheelEvent*>(event.get());
+ auto mouse_wheel_event = event->AsMouseWheelEvent();
EXPECT_EQ(gfx::Vector2d(0, -2 * MouseWheelEvent::kWheelDelta),
mouse_wheel_event->offset());
EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON, mouse_wheel_event->button_flags());
@@ -220,7 +220,7 @@ TEST_F(WaylandPointerTest, AxisHorizontal) {
ASSERT_TRUE(event);
ASSERT_TRUE(event->IsMouseWheelEvent());
- auto mouse_wheel_event = static_cast<MouseWheelEvent*>(event.get());
+ auto mouse_wheel_event = event->AsMouseWheelEvent();
EXPECT_EQ(gfx::Vector2d(MouseWheelEvent::kWheelDelta, 0),
mouse_wheel_event->offset());
EXPECT_EQ(EF_LEFT_MOUSE_BUTTON, mouse_wheel_event->button_flags());

Powered by Google App Engine
This is Rietveld 408576698