OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "content/browser/renderer_host/render_widget_host_impl.h" | 8 #include "content/browser/renderer_host/render_widget_host_impl.h" |
9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
10 #include "content/common/input/synthetic_web_input_event_builders.h" | 10 #include "content/common/input/synthetic_web_input_event_builders.h" |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 // WebViewImpl::hasTouchEventHandlersAt() is implemented. | 276 // WebViewImpl::hasTouchEventHandlersAt() is implemented. |
277 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, filter()->last_ack_state()); | 277 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, filter()->last_ack_state()); |
278 } | 278 } |
279 | 279 |
280 touch.PressPoint(25, 125); | 280 touch.PressPoint(25, 125); |
281 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo()); | 281 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo()); |
282 filter()->WaitForAck(WebInputEvent::TouchStart); | 282 filter()->WaitForAck(WebInputEvent::TouchStart); |
283 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state()); | 283 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state()); |
284 } | 284 } |
285 | 285 |
| 286 // Threaded compositing is always enabled on Aura. |
| 287 #if !defined(USE_AURA) |
286 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, | 288 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, |
287 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 289 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
| 290 #endif |
288 | 291 |
289 #if !defined(OS_MACOSX) | 292 #if !defined(OS_MACOSX) |
290 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, | 293 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, |
291 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 294 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
292 #endif | 295 #endif |
293 | 296 |
294 } // namespace content | 297 } // namespace content |
OLD | NEW |