Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: content/renderer/input/input_handler_manager.h

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Add early out to accommodate null frameWidget in webkit_unit_tests. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
54 InputHandlerManager( 54 InputHandlerManager(
55 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 55 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
56 InputHandlerManagerClient* client, 56 InputHandlerManagerClient* client,
57 SynchronousInputHandlerProxyClient* sync_handler_client, 57 SynchronousInputHandlerProxyClient* sync_handler_client,
58 blink::scheduler::RendererScheduler* renderer_scheduler); 58 blink::scheduler::RendererScheduler* renderer_scheduler);
59 virtual ~InputHandlerManager(); 59 virtual ~InputHandlerManager();
60 60
61 // Callable from the main thread only. 61 // Callable from the main thread only.
62 void AddInputHandler(int routing_id, 62 void AddInputHandler(int routing_id,
63 const base::WeakPtr<cc::InputHandler>& input_handler, 63 const base::WeakPtr<cc::InputHandler>& input_handler,
64 const base::WeakPtr<RenderViewImpl>& render_view_impl, 64 const base::WeakPtr<RenderWidget>& render_widget,
65 bool enable_smooth_scrolling); 65 bool enable_smooth_scrolling);
66 66
67 void RegisterRoutingID(int routing_id); 67 void RegisterRoutingID(int routing_id);
68 void UnregisterRoutingID(int routing_id); 68 void UnregisterRoutingID(int routing_id);
69 69
70 void ObserveGestureEventAndResultOnMainThread( 70 void ObserveGestureEventAndResultOnMainThread(
71 int routing_id, 71 int routing_id,
72 const blink::WebGestureEvent& gesture_event, 72 const blink::WebGestureEvent& gesture_event,
73 const cc::InputHandlerScrollResult& scroll_result); 73 const cc::InputHandlerScrollResult& scroll_result);
74 74
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 int routing_id, 108 int routing_id,
109 ui::ScopedWebInputEvent event, 109 ui::ScopedWebInputEvent event,
110 const ui::LatencyInfo& latency_info); 110 const ui::LatencyInfo& latency_info);
111 111
112 private: 112 private:
113 // Called from the compositor's thread. 113 // Called from the compositor's thread.
114 void AddInputHandlerOnCompositorThread( 114 void AddInputHandlerOnCompositorThread(
115 int routing_id, 115 int routing_id,
116 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, 116 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
117 const base::WeakPtr<cc::InputHandler>& input_handler, 117 const base::WeakPtr<cc::InputHandler>& input_handler,
118 const base::WeakPtr<RenderViewImpl>& render_view_impl, 118 const base::WeakPtr<RenderWidget>& render_widget,
119 bool enable_smooth_scrolling); 119 bool enable_smooth_scrolling);
120 120
121 void RegisterRoutingIDOnCompositorThread(int routing_id); 121 void RegisterRoutingIDOnCompositorThread(int routing_id);
122 void UnregisterRoutingIDOnCompositorThread(int routing_id); 122 void UnregisterRoutingIDOnCompositorThread(int routing_id);
123 123
124 void ObserveWheelEventAndResultOnCompositorThread( 124 void ObserveWheelEventAndResultOnCompositorThread(
125 int routing_id, 125 int routing_id,
126 const blink::WebMouseWheelEvent& wheel_event, 126 const blink::WebMouseWheelEvent& wheel_event,
127 const cc::InputHandlerScrollResult& scroll_result); 127 const cc::InputHandlerScrollResult& scroll_result);
128 128
(...skipping 19 matching lines...) Expand all
148 // May be null. 148 // May be null.
149 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_; 149 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_;
150 blink::scheduler::RendererScheduler* const renderer_scheduler_; // Not owned. 150 blink::scheduler::RendererScheduler* const renderer_scheduler_; // Not owned.
151 151
152 base::WeakPtrFactory<InputHandlerManager> weak_ptr_factory_; 152 base::WeakPtrFactory<InputHandlerManager> weak_ptr_factory_;
153 }; 153 };
154 154
155 } // namespace content 155 } // namespace content
156 156
157 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 157 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698