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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/host/ash_window_tree_host_x11_unittest.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/host/transformer_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_x11_unittest.cc
diff --git a/ash/host/ash_window_tree_host_x11_unittest.cc b/ash/host/ash_window_tree_host_x11_unittest.cc
index c27ac0edc36a7a75950bda2ce7111bbba470bd0a..db5c15826ffa0067df9d25864923920290b7d2cc 100644
--- a/ash/host/ash_window_tree_host_x11_unittest.cc
+++ b/ash/host/ash_window_tree_host_x11_unittest.cc
@@ -84,9 +84,11 @@ class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
// Fails on ChromeOS valgrind bot. http://crbug.com/499997
#if defined(OS_CHROMEOS)
-#define MAYBE_DispatchTouchEventToOneRootWindow DISABLED_DispatchTouchEventToOneRootWindow
+#define MAYBE_DispatchTouchEventToOneRootWindow \
+ DISABLED_DispatchTouchEventToOneRootWindow
#else
-#define MAYBE_DispatchTouchEventToOneRootWindow DispatchTouchEventToOneRootWindow
+#define MAYBE_DispatchTouchEventToOneRootWindow \
+ DispatchTouchEventToOneRootWindow
#endif
// Send X touch events to one WindowTreeHost. The WindowTreeHost's
@@ -109,8 +111,8 @@ TEST_F(AshWindowTreeHostX11Test, MAYBE_DispatchTouchEventToOneRootWindow) {
ui::ScopedXI2Event scoped_xevent;
// This touch is out of bounds.
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchBegin, 5, gfx::Point(1500, 2500),
+ valuators);
if (window_tree_host->CanDispatchEvent(scoped_xevent))
window_tree_host->DispatchEvent(scoped_xevent);
EXPECT_EQ(ui::ET_UNKNOWN, handler->last_touch_type());
@@ -118,24 +120,24 @@ TEST_F(AshWindowTreeHostX11Test, MAYBE_DispatchTouchEventToOneRootWindow) {
EXPECT_EQ(gfx::Point(0, 0), handler->last_touch_location());
// Following touchs are within bounds and are passed to delegate.
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchBegin, 5, gfx::Point(1500, 1500), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchBegin, 5, gfx::Point(1500, 1500),
+ valuators);
if (window_tree_host->CanDispatchEvent(scoped_xevent))
window_tree_host->DispatchEvent(scoped_xevent);
EXPECT_EQ(ui::ET_TOUCH_PRESSED, handler->last_touch_type());
EXPECT_EQ(0, handler->last_touch_id());
EXPECT_EQ(gfx::Point(1500, 1500), handler->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchUpdate, 5, gfx::Point(1500, 1600), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchUpdate, 5, gfx::Point(1500, 1600),
+ valuators);
if (window_tree_host->CanDispatchEvent(scoped_xevent))
window_tree_host->DispatchEvent(scoped_xevent);
EXPECT_EQ(ui::ET_TOUCH_MOVED, handler->last_touch_type());
EXPECT_EQ(0, handler->last_touch_id());
EXPECT_EQ(gfx::Point(1500, 1600), handler->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchEnd, 5, gfx::Point(1500, 1600), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchEnd, 5, gfx::Point(1500, 1600),
+ valuators);
if (window_tree_host->CanDispatchEvent(scoped_xevent))
window_tree_host->DispatchEvent(scoped_xevent);
EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler->last_touch_type());
@@ -174,8 +176,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
// 2 Touch events are targeted at the second WindowTreeHost.
ui::ScopedXI2Event scoped_xevent;
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchBegin, 5, gfx::Point(1500, 2500),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
@@ -187,8 +189,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
EXPECT_EQ(0, handler2->last_touch_id());
EXPECT_EQ(gfx::Point(1500, 2500), handler2->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchBegin, 6, gfx::Point(1600, 2600), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchBegin, 6, gfx::Point(1600, 2600),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
@@ -200,8 +202,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
EXPECT_EQ(1, handler2->last_touch_id());
EXPECT_EQ(gfx::Point(1600, 2600), handler2->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchUpdate, 5, gfx::Point(1500, 2550), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchUpdate, 5, gfx::Point(1500, 2550),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
@@ -213,8 +215,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
EXPECT_EQ(0, handler2->last_touch_id());
EXPECT_EQ(gfx::Point(1500, 2550), handler2->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchUpdate, 6, gfx::Point(1600, 2650), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchUpdate, 6, gfx::Point(1600, 2650),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
@@ -226,8 +228,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
EXPECT_EQ(1, handler2->last_touch_id());
EXPECT_EQ(gfx::Point(1600, 2650), handler2->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchEnd, 5, gfx::Point(1500, 2550), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchEnd, 5, gfx::Point(1500, 2550),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
@@ -239,8 +241,8 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
EXPECT_EQ(0, handler2->last_touch_id());
EXPECT_EQ(gfx::Point(1500, 2550), handler2->last_touch_location());
- scoped_xevent.InitTouchEvent(
- 0, XI_TouchEnd, 6, gfx::Point(1600, 2650), valuators);
+ scoped_xevent.InitTouchEvent(0, XI_TouchEnd, 6, gfx::Point(1600, 2650),
+ valuators);
if (window_tree_host1->CanDispatchEvent(scoped_xevent))
window_tree_host1->DispatchEvent(scoped_xevent);
if (window_tree_host2->CanDispatchEvent(scoped_xevent))
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/host/transformer_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698