ui/aura/window_tree_host_x11_unittest.cc - Issue 191223007: Move touch CTM from X into Chrome

Unified Diff: ui/aura/window_tree_host_x11_unittest.cc

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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/aura/window_tree_host_x11_unittest.cc

diff --git a/ui/aura/window_tree_host_x11_unittest.cc b/ui/aura/window_tree_host_x11_unittest.cc

index 0deb034af47d6bfae1bff60d97c882b6e759dc9c..610f1b9a78e006d093aea3e8dc19f213b02c2fcf 100644

--- a/ui/aura/window_tree_host_x11_unittest.cc

+++ b/ui/aura/window_tree_host_x11_unittest.cc

@@ -166,8 +166,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_PRESSED, handler2->last_touch_type());

EXPECT_EQ(0, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1500, 2500 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1500, 2500), handler2->last_touch_location());

scoped_xevent.InitTouchEvent(

0, XI_TouchBegin, 6, gfx::Point(1600, 2600), valuators);

@@ -178,8 +177,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_PRESSED, handler2->last_touch_type());

EXPECT_EQ(1, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1600, 2600 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1600, 2600), handler2->last_touch_location());

scoped_xevent.InitTouchEvent(

0, XI_TouchUpdate, 5, gfx::Point(1500, 2550), valuators);

@@ -190,8 +188,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_MOVED, handler2->last_touch_type());

EXPECT_EQ(0, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1500, 2550 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1500, 2550), handler2->last_touch_location());

scoped_xevent.InitTouchEvent(

0, XI_TouchUpdate, 6, gfx::Point(1600, 2650), valuators);

@@ -202,8 +199,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_MOVED, handler2->last_touch_type());

EXPECT_EQ(1, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1600, 2650 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1600, 2650), handler2->last_touch_location());

scoped_xevent.InitTouchEvent(

0, XI_TouchEnd, 5, gfx::Point(1500, 2550), valuators);

@@ -214,8 +210,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler2->last_touch_type());

EXPECT_EQ(0, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1500, 2550 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1500, 2550), handler2->last_touch_location());

scoped_xevent.InitTouchEvent(

0, XI_TouchEnd, 6, gfx::Point(1600, 2650), valuators);

@@ -226,8 +221,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {

EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());

EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler2->last_touch_type());

EXPECT_EQ(1, handler2->last_touch_id());

- EXPECT_EQ(gfx::Point(1600, 2650 - host2_y_offset),

- handler2->last_touch_location());

+ EXPECT_EQ(gfx::Point(1600, 2650), handler2->last_touch_location());

// Revert the CrOS testing env otherwise the following non-CrOS aura

// tests will fail.

« ui/aura/window_tree_host_x11.cc ('K') | « ui/aura/window_tree_host_x11.cc ('k') | ui/events/events.gyp » ('j') | ui/events/touch_ctm.h » ('J')