| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "content/browser/renderer_host/input/gesture_event_filter.h" | 8 #include "content/browser/renderer_host/input/gesture_event_filter.h" |
| 9 #include "content/browser/renderer_host/input/immediate_input_router.h" | 9 #include "content/browser/renderer_host/input/immediate_input_router.h" |
| 10 #include "content/browser/renderer_host/input/input_router_client.h" | 10 #include "content/browser/renderer_host/input/input_router_client.h" |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 } | 540 } |
| 541 | 541 |
| 542 size_t TouchEventQueueSize() { | 542 size_t TouchEventQueueSize() { |
| 543 return touch_event_queue()->GetQueueSize(); | 543 return touch_event_queue()->GetQueueSize(); |
| 544 } | 544 } |
| 545 | 545 |
| 546 const WebTouchEvent& latest_event() const { | 546 const WebTouchEvent& latest_event() const { |
| 547 return touch_event_queue()->GetLatestEvent().event; | 547 return touch_event_queue()->GetLatestEvent().event; |
| 548 } | 548 } |
| 549 | 549 |
| 550 void EnableNoTouchToRendererWhileScrolling() { |
| 551 input_router_->enable_no_touch_to_renderer_while_scrolling_ = true; |
| 552 } |
| 553 |
| 554 bool no_touch_move_to_renderer() { |
| 555 return touch_event_queue()->no_touch_move_to_renderer_; |
| 556 } |
| 557 |
| 550 TouchEventQueue* touch_event_queue() const { | 558 TouchEventQueue* touch_event_queue() const { |
| 551 return input_router_->touch_event_queue(); | 559 return input_router_->touch_event_queue(); |
| 552 } | 560 } |
| 553 | 561 |
| 554 unsigned GestureEventLastQueueEventSize() { | 562 unsigned GestureEventLastQueueEventSize() { |
| 555 return gesture_event_filter()->coalesced_gesture_events_.size(); | 563 return gesture_event_filter()->coalesced_gesture_events_.size(); |
| 556 } | 564 } |
| 557 | 565 |
| 558 WebGestureEvent GestureEventSecondFromLastQueueEvent() { | 566 WebGestureEvent GestureEventSecondFromLastQueueEvent() { |
| 559 return gesture_event_filter()->coalesced_gesture_events_.at( | 567 return gesture_event_filter()->coalesced_gesture_events_.at( |
| (...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2157 // Check that the second event was sent. | 2165 // Check that the second event was sent. |
| 2158 EXPECT_EQ(1U, process_->sink().message_count()); | 2166 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2159 EXPECT_TRUE(process_->sink().GetUniqueMessageMatching( | 2167 EXPECT_TRUE(process_->sink().GetUniqueMessageMatching( |
| 2160 InputMsg_HandleInputEvent::ID)); | 2168 InputMsg_HandleInputEvent::ID)); |
| 2161 process_->sink().ClearMessages(); | 2169 process_->sink().ClearMessages(); |
| 2162 | 2170 |
| 2163 // Check that the correct unhandled wheel event was received. | 2171 // Check that the correct unhandled wheel event was received. |
| 2164 EXPECT_EQ(client_->acked_wheel_event().deltaY, -5); | 2172 EXPECT_EQ(client_->acked_wheel_event().deltaY, -5); |
| 2165 } | 2173 } |
| 2166 | 2174 |
| 2175 // Tests that no touch move events are sent to renderer during scrolling. |
| 2176 TEST_F(ImmediateInputRouterTest, NoTouchMoveWhileScroll) { |
| 2177 EnableNoTouchToRendererWhileScrolling(); |
| 2178 set_debounce_interval_time_ms(0); |
| 2179 input_router_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true)); |
| 2180 process_->sink().ClearMessages(); |
| 2181 |
| 2182 // First touch press. |
| 2183 PressTouchPoint(0, 1); |
| 2184 SendTouchEvent(); |
| 2185 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2186 process_->sink().ClearMessages(); |
| 2187 SendInputEventACK(WebInputEvent::TouchStart, |
| 2188 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2189 |
| 2190 // Touch move will trigger scroll. |
| 2191 MoveTouchPoint(0, 20, 5); |
| 2192 SendTouchEvent(); |
| 2193 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2194 process_->sink().ClearMessages(); |
| 2195 SendInputEventACK(WebInputEvent::TouchMove, |
| 2196 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2197 |
| 2198 SimulateGestureEvent(WebInputEvent::GestureScrollBegin, |
| 2199 WebGestureEvent::Touchscreen); |
| 2200 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2201 EXPECT_FALSE(no_touch_move_to_renderer()); |
| 2202 process_->sink().ClearMessages(); |
| 2203 SendInputEventACK(WebInputEvent::GestureScrollBegin, |
| 2204 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2205 |
| 2206 // Touch event keeps coming. |
| 2207 MoveTouchPoint(0, 30, 5); |
| 2208 SendTouchEvent(); |
| 2209 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2210 process_->sink().ClearMessages(); |
| 2211 SendInputEventACK(WebInputEvent::TouchMove, |
| 2212 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2213 |
| 2214 // On GestureScrollUpdate, stop sending touch move to renderer. |
| 2215 SimulateGestureScrollUpdateEvent(20, 4, 0); |
| 2216 EXPECT_TRUE(no_touch_move_to_renderer()); |
| 2217 process_->sink().ClearMessages(); |
| 2218 SendInputEventACK(WebInputEvent::GestureScrollUpdate, |
| 2219 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2220 |
| 2221 // Touch move should not be sent to renderer. |
| 2222 MoveTouchPoint(0, 65, 10); |
| 2223 SendTouchEvent(); |
| 2224 EXPECT_EQ(0U, process_->sink().message_count()); |
| 2225 process_->sink().ClearMessages(); |
| 2226 |
| 2227 // Touch end should still be sent to renderer. |
| 2228 ReleaseTouchPoint(0); |
| 2229 SendTouchEvent(); |
| 2230 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2231 process_->sink().ClearMessages(); |
| 2232 SendInputEventACK(WebInputEvent::TouchEnd, |
| 2233 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2234 |
| 2235 // On GestureScrollEnd, resume sending touch moves to renderer. |
| 2236 SimulateGestureEvent(WebKit::WebInputEvent::GestureScrollEnd, |
| 2237 WebGestureEvent::Touchscreen); |
| 2238 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2239 EXPECT_FALSE(no_touch_move_to_renderer()); |
| 2240 process_->sink().ClearMessages(); |
| 2241 SendInputEventACK(WebInputEvent::GestureScrollEnd, |
| 2242 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2243 |
| 2244 // Now touch events should come through to renderer. |
| 2245 PressTouchPoint(80, 10); |
| 2246 SendTouchEvent(); |
| 2247 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2248 process_->sink().ClearMessages(); |
| 2249 SendInputEventACK(WebInputEvent::TouchStart, |
| 2250 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2251 |
| 2252 MoveTouchPoint(0, 80, 20); |
| 2253 SendTouchEvent(); |
| 2254 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2255 process_->sink().ClearMessages(); |
| 2256 SendInputEventACK(WebInputEvent::TouchMove, |
| 2257 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2258 |
| 2259 ReleaseTouchPoint(0); |
| 2260 SendTouchEvent(); |
| 2261 EXPECT_EQ(1U, process_->sink().message_count()); |
| 2262 process_->sink().ClearMessages(); |
| 2263 SendInputEventACK(WebInputEvent::TouchEnd, |
| 2264 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2265 } |
| 2167 } // namespace content | 2266 } // namespace content |
| OLD | NEW |