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" |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 GestureEventFilter* gesture_event_filter() const { |
319 return immediate_input_router_->gesture_event_filter_.get(); | 319 return static_cast<GestureEventFilter*>( |
| 320 immediate_input_router_->gesture_event_filter()); |
320 } | 321 } |
321 | 322 |
322 GestureEventFilter* gesture_event_filter() { | 323 GestureEventFilter* gesture_event_filter() { |
323 return immediate_input_router_->gesture_event_filter_.get(); | 324 return static_cast<GestureEventFilter*>( |
| 325 immediate_input_router_->gesture_event_filter()); |
324 } | 326 } |
325 | 327 |
326 private: | 328 private: |
327 bool unresponsive_timer_fired_; | 329 bool unresponsive_timer_fired_; |
328 | 330 |
329 // |immediate_input_router_| and |mock_input_router_| are owned by | 331 // |immediate_input_router_| and |mock_input_router_| are owned by |
330 // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so | 332 // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so |
331 // that we don't have to reinterpret_cast it all the time. | 333 // that we don't have to reinterpret_cast it all the time. |
332 ImmediateInputRouter* immediate_input_router_; | 334 ImmediateInputRouter* immediate_input_router_; |
333 MockInputRouter* mock_input_router_; | 335 MockInputRouter* mock_input_router_; |
(...skipping 2143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2477 | 2479 |
2478 TEST_F(RenderWidgetHostTest, InputRouterReceivesHasTouchEventHandlers) { | 2480 TEST_F(RenderWidgetHostTest, InputRouterReceivesHasTouchEventHandlers) { |
2479 host_->SetupForInputRouterTest(); | 2481 host_->SetupForInputRouterTest(); |
2480 | 2482 |
2481 host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true)); | 2483 host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true)); |
2482 | 2484 |
2483 EXPECT_TRUE(host_->mock_input_router()->message_received_); | 2485 EXPECT_TRUE(host_->mock_input_router()->message_received_); |
2484 } | 2486 } |
2485 | 2487 |
2486 } // namespace content | 2488 } // namespace content |
OLD | NEW |