| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/memory/shared_memory.h" | 8 #include "base/memory/shared_memory.h" |
| 9 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
| 10 #include "content/browser/browser_thread_impl.h" | 10 #include "content/browser/browser_thread_impl.h" |
| 11 #include "content/browser/renderer_host/backing_store.h" | 11 #include "content/browser/renderer_host/backing_store.h" |
| 12 #include "content/browser/renderer_host/input/gesture_event_filter.h" | 12 #include "content/browser/renderer_host/input/base_gesture_event_filter.h" |
| 13 #include "content/browser/renderer_host/input/immediate_input_router.h" | 13 #include "content/browser/renderer_host/input/immediate_input_router.h" |
| 14 #include "content/browser/renderer_host/input/synthetic_web_input_event_builders
.h" | 14 #include "content/browser/renderer_host/input/synthetic_web_input_event_builders
.h" |
| 15 #include "content/browser/renderer_host/input/tap_suppression_controller.h" | 15 #include "content/browser/renderer_host/input/tap_suppression_controller.h" |
| 16 #include "content/browser/renderer_host/input/tap_suppression_controller_client.
h" | 16 #include "content/browser/renderer_host/input/tap_suppression_controller_client.
h" |
| 17 #include "content/browser/renderer_host/input/touch_event_queue.h" | 17 #include "content/browser/renderer_host/input/touch_event_queue.h" |
| 18 #include "content/browser/renderer_host/overscroll_controller.h" | 18 #include "content/browser/renderer_host/overscroll_controller.h" |
| 19 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 19 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
| 20 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 20 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
| 21 #include "content/browser/renderer_host/test_render_view_host.h" | 21 #include "content/browser/renderer_host/test_render_view_host.h" |
| 22 #include "content/common/input_messages.h" | 22 #include "content/common/input_messages.h" |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 | 237 |
| 238 WebGestureEvent GestureEventQueueEventAt(int i) const { | 238 WebGestureEvent GestureEventQueueEventAt(int i) const { |
| 239 return gesture_event_filter()->coalesced_gesture_events_.at(i).event; | 239 return gesture_event_filter()->coalesced_gesture_events_.at(i).event; |
| 240 } | 240 } |
| 241 | 241 |
| 242 bool ScrollingInProgress() const { | 242 bool ScrollingInProgress() const { |
| 243 return gesture_event_filter()->scrolling_in_progress_; | 243 return gesture_event_filter()->scrolling_in_progress_; |
| 244 } | 244 } |
| 245 | 245 |
| 246 bool FlingInProgress() const { | 246 bool FlingInProgress() const { |
| 247 return gesture_event_filter()->fling_in_progress_; | 247 return immediate_input_router_->flinger_->fling_in_progress_; |
| 248 } | 248 } |
| 249 | 249 |
| 250 bool WillIgnoreNextACK() const { | 250 bool WillIgnoreNextACK() const { |
| 251 return gesture_event_filter()->ignore_next_ack_; | 251 return gesture_event_filter()->ignore_next_ack_; |
| 252 } | 252 } |
| 253 | 253 |
| 254 void SetupForOverscrollControllerTest() { | 254 void SetupForOverscrollControllerTest() { |
| 255 SetOverscrollControllerEnabled(true); | 255 SetOverscrollControllerEnabled(true); |
| 256 overscroll_delegate_.reset(new TestOverscrollDelegate(GetView())); | 256 overscroll_delegate_.reset(new TestOverscrollDelegate(GetView())); |
| 257 overscroll_controller_->set_delegate(overscroll_delegate_.get()); | 257 overscroll_controller_->set_delegate(overscroll_delegate_.get()); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 | 308 |
| 309 protected: | 309 protected: |
| 310 virtual void NotifyRendererUnresponsive() OVERRIDE { | 310 virtual void NotifyRendererUnresponsive() OVERRIDE { |
| 311 unresponsive_timer_fired_ = true; | 311 unresponsive_timer_fired_ = true; |
| 312 } | 312 } |
| 313 | 313 |
| 314 const TouchEventQueue* touch_event_queue() const { | 314 const TouchEventQueue* touch_event_queue() const { |
| 315 return immediate_input_router_->touch_event_queue_.get(); | 315 return immediate_input_router_->touch_event_queue_.get(); |
| 316 } | 316 } |
| 317 | 317 |
| 318 const GestureEventFilter* gesture_event_filter() const { | 318 const BaseGestureEventFilter* gesture_event_filter() const { |
| 319 return immediate_input_router_->gesture_event_filter_.get(); | 319 return immediate_input_router_->event_filter_.get(); |
| 320 } | 320 } |
| 321 | 321 |
| 322 GestureEventFilter* gesture_event_filter() { | 322 BaseGestureEventFilter* gesture_event_filter() { |
| 323 return immediate_input_router_->gesture_event_filter_.get(); | 323 return immediate_input_router_->event_filter_.get(); |
| 324 } | 324 } |
| 325 | 325 |
| 326 private: | 326 private: |
| 327 bool unresponsive_timer_fired_; | 327 bool unresponsive_timer_fired_; |
| 328 | 328 |
| 329 // |immediate_input_router_| and |mock_input_router_| are owned by | 329 // |immediate_input_router_| and |mock_input_router_| are owned by |
| 330 // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so | 330 // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so |
| 331 // that we don't have to reinterpret_cast it all the time. | 331 // that we don't have to reinterpret_cast it all the time. |
| 332 ImmediateInputRouter* immediate_input_router_; | 332 ImmediateInputRouter* immediate_input_router_; |
| 333 MockInputRouter* mock_input_router_; | 333 MockInputRouter* mock_input_router_; |
| (...skipping 2178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2512 | 2512 |
| 2513 TEST_F(RenderWidgetHostTest, InputRouterReceivesHasTouchEventHandlers) { | 2513 TEST_F(RenderWidgetHostTest, InputRouterReceivesHasTouchEventHandlers) { |
| 2514 host_->SetupForInputRouterTest(); | 2514 host_->SetupForInputRouterTest(); |
| 2515 | 2515 |
| 2516 host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true)); | 2516 host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true)); |
| 2517 | 2517 |
| 2518 EXPECT_TRUE(host_->mock_input_router()->message_received_); | 2518 EXPECT_TRUE(host_->mock_input_router()->message_received_); |
| 2519 } | 2519 } |
| 2520 | 2520 |
| 2521 } // namespace content | 2521 } // namespace content |
| OLD | NEW |