| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 int last_touch_y = ExecuteScriptAndExtractInt( | 177 int last_touch_y = ExecuteScriptAndExtractInt( |
| 178 "window.lastTouchMoveEvent.touches[0].pageY"); | 178 "window.lastTouchMoveEvent.touches[0].pageY"); |
| 179 EXPECT_EQ(35, last_touch_x); | 179 EXPECT_EQ(35, last_touch_x); |
| 180 EXPECT_EQ(40, last_touch_y); | 180 EXPECT_EQ(40, last_touch_y); |
| 181 } | 181 } |
| 182 | 182 |
| 183 private: | 183 private: |
| 184 DISALLOW_COPY_AND_ASSIGN(MainThreadEventQueueBrowserTest); | 184 DISALLOW_COPY_AND_ASSIGN(MainThreadEventQueueBrowserTest); |
| 185 }; | 185 }; |
| 186 | 186 |
| 187 #if defined(OS_LINUX) | |
| 188 #define MAYBE_MouseMove DISABLED_MouseMove | |
| 189 #else | |
| 190 #define MAYBE_MouseMove MouseMove | 187 #define MAYBE_MouseMove MouseMove |
| 191 #endif | 188 IN_PROC_BROWSER_TEST_F(MainThreadEventQueueBrowserTest, MouseMove) { |
| 192 IN_PROC_BROWSER_TEST_F(MainThreadEventQueueBrowserTest, MAYBE_MouseMove) { | |
| 193 LoadURL(kJankyPageURL); | 189 LoadURL(kJankyPageURL); |
| 194 DoMouseMove(); | 190 DoMouseMove(); |
| 195 } | 191 } |
| 196 | 192 |
| 197 // Disabled on MacOS because it doesn't support touch input. | 193 // Disabled on MacOS because it doesn't support touch input. |
| 198 #if defined(OS_MACOSX) | 194 #if defined(OS_MACOSX) |
| 199 #define MAYBE_TouchMove DISABLED_TouchMove | 195 #define MAYBE_TouchMove DISABLED_TouchMove |
| 200 #else | 196 #else |
| 201 #define MAYBE_TouchMove TouchMove | 197 #define MAYBE_TouchMove TouchMove |
| 202 #endif | 198 #endif |
| 203 IN_PROC_BROWSER_TEST_F(MainThreadEventQueueBrowserTest, MAYBE_TouchMove) { | 199 IN_PROC_BROWSER_TEST_F(MainThreadEventQueueBrowserTest, MAYBE_TouchMove) { |
| 204 LoadURL(kJankyPageURL); | 200 LoadURL(kJankyPageURL); |
| 205 DoTouchMove(); | 201 DoTouchMove(); |
| 206 } | 202 } |
| 207 | 203 |
| 208 } // namespace content | 204 } // namespace content |
| OLD | NEW |