Chromium Code Reviews| 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 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ | 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ |
| 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ | 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ |
| 7 | 7 |
| 8 #include "base/containers/scoped_ptr_hash_map.h" | 8 #include "base/containers/scoped_ptr_hash_map.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 const base::WeakPtr<cc::InputHandler>& input_handler, | 54 const base::WeakPtr<cc::InputHandler>& input_handler, |
| 55 const base::WeakPtr<RenderViewImpl>& render_view_impl, | 55 const base::WeakPtr<RenderViewImpl>& render_view_impl, |
| 56 bool enable_smooth_scrolling, | 56 bool enable_smooth_scrolling, |
| 57 bool enable_wheel_gestures); | 57 bool enable_wheel_gestures); |
| 58 | 58 |
| 59 void ObserveWheelEventAndResultOnMainThread( | 59 void ObserveWheelEventAndResultOnMainThread( |
| 60 int routing_id, | 60 int routing_id, |
| 61 const blink::WebMouseWheelEvent& wheel_event, | 61 const blink::WebMouseWheelEvent& wheel_event, |
| 62 const cc::InputHandlerScrollResult& scroll_result); | 62 const cc::InputHandlerScrollResult& scroll_result); |
| 63 | 63 |
| 64 void ObserveGestureEventAndResultOnMainThread( | |
| 65 int routing_id, | |
| 66 const blink::WebGestureEvent& gesture_event, | |
| 67 const cc::InputHandlerScrollResult& scroll_result); | |
| 68 | |
| 64 void NonBlockingInputEventHandledOnMainThread(int routing_id, | 69 void NonBlockingInputEventHandledOnMainThread(int routing_id, |
| 65 blink::WebInputEvent::Type); | 70 blink::WebInputEvent::Type); |
| 66 | 71 |
| 67 // Callback only from the compositor's thread. | 72 // Callback only from the compositor's thread. |
| 68 void RemoveInputHandler(int routing_id); | 73 void RemoveInputHandler(int routing_id); |
| 69 | 74 |
| 70 // Called from the compositor's thread. | 75 // Called from the compositor's thread. |
| 71 InputEventAckState HandleInputEvent(int routing_id, | 76 InputEventAckState HandleInputEvent(int routing_id, |
| 72 const blink::WebInputEvent* input_event, | 77 const blink::WebInputEvent* input_event, |
| 73 ui::LatencyInfo* latency_info); | 78 ui::LatencyInfo* latency_info); |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 89 const base::WeakPtr<cc::InputHandler>& input_handler, | 94 const base::WeakPtr<cc::InputHandler>& input_handler, |
| 90 const base::WeakPtr<RenderViewImpl>& render_view_impl, | 95 const base::WeakPtr<RenderViewImpl>& render_view_impl, |
| 91 bool enable_smooth_scrolling, | 96 bool enable_smooth_scrolling, |
| 92 bool enable_wheel_gestures); | 97 bool enable_wheel_gestures); |
| 93 | 98 |
| 94 void ObserveWheelEventAndResultOnCompositorThread( | 99 void ObserveWheelEventAndResultOnCompositorThread( |
| 95 int routing_id, | 100 int routing_id, |
| 96 const blink::WebMouseWheelEvent& wheel_event, | 101 const blink::WebMouseWheelEvent& wheel_event, |
| 97 const cc::InputHandlerScrollResult& scroll_result); | 102 const cc::InputHandlerScrollResult& scroll_result); |
| 98 | 103 |
| 104 void ObserveGestureEventAndResultOnCompositorThread( | |
| 105 int routing_id, | |
| 106 const blink::WebGestureEvent& gesture_event, | |
| 107 const cc::InputHandlerScrollResult& scroll_result); | |
|
tdresser
2016/03/02 18:26:53
nit: newline
dtapuska
2016/03/07 18:03:59
Done.
| |
| 99 void NonBlockingInputEventHandledOnCompositorThread( | 108 void NonBlockingInputEventHandledOnCompositorThread( |
| 100 int routing_id, | 109 int routing_id, |
| 101 blink::WebInputEvent::Type); | 110 blink::WebInputEvent::Type); |
| 102 | 111 |
| 103 typedef base::ScopedPtrHashMap<int, // routing_id | 112 typedef base::ScopedPtrHashMap<int, // routing_id |
| 104 scoped_ptr<InputHandlerWrapper>> | 113 scoped_ptr<InputHandlerWrapper>> |
| 105 InputHandlerMap; | 114 InputHandlerMap; |
| 106 InputHandlerMap input_handlers_; | 115 InputHandlerMap input_handlers_; |
| 107 | 116 |
| 108 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 117 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 109 InputHandlerManagerClient* client_; | 118 InputHandlerManagerClient* client_; |
| 110 scheduler::RendererScheduler* renderer_scheduler_; // Not owned. | 119 scheduler::RendererScheduler* renderer_scheduler_; // Not owned. |
| 111 }; | 120 }; |
| 112 | 121 |
| 113 } // namespace content | 122 } // namespace content |
| 114 | 123 |
| 115 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ | 124 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ |
| OLD | NEW |