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

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

Issue 2118273002: Ensure acks are sent for all blocking events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 months 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 int routing_id, 66 int routing_id,
67 const blink::WebMouseWheelEvent& wheel_event, 67 const blink::WebMouseWheelEvent& wheel_event,
68 const cc::InputHandlerScrollResult& scroll_result); 68 const cc::InputHandlerScrollResult& scroll_result);
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
75 void NotifyInputEventHandledOnMainThread(int routing_id, 75 void NotifyInputEventHandledOnMainThread(int routing_id,
76 blink::WebInputEvent::Type); 76 blink::WebInputEvent::Type,
77 InputEventAckState);
77 78
78 // Callback only from the compositor's thread. 79 // Callback only from the compositor's thread.
79 void RemoveInputHandler(int routing_id); 80 void RemoveInputHandler(int routing_id);
80 81
81 // Called from the compositor's thread. 82 // Called from the compositor's thread.
82 virtual InputEventAckState HandleInputEvent( 83 virtual InputEventAckState HandleInputEvent(
83 int routing_id, 84 int routing_id,
84 const blink::WebInputEvent* input_event, 85 const blink::WebInputEvent* input_event,
85 ui::LatencyInfo* latency_info); 86 ui::LatencyInfo* latency_info);
86 87
(...skipping 24 matching lines...) Expand all
111 int routing_id, 112 int routing_id,
112 const blink::WebMouseWheelEvent& wheel_event, 113 const blink::WebMouseWheelEvent& wheel_event,
113 const cc::InputHandlerScrollResult& scroll_result); 114 const cc::InputHandlerScrollResult& scroll_result);
114 115
115 void ObserveGestureEventAndResultOnCompositorThread( 116 void ObserveGestureEventAndResultOnCompositorThread(
116 int routing_id, 117 int routing_id,
117 const blink::WebGestureEvent& gesture_event, 118 const blink::WebGestureEvent& gesture_event,
118 const cc::InputHandlerScrollResult& scroll_result); 119 const cc::InputHandlerScrollResult& scroll_result);
119 120
120 void NotifyInputEventHandledOnCompositorThread(int routing_id, 121 void NotifyInputEventHandledOnCompositorThread(int routing_id,
121 blink::WebInputEvent::Type); 122 blink::WebInputEvent::Type,
123 InputEventAckState);
122 124
123 typedef base::ScopedPtrHashMap<int, // routing_id 125 typedef base::ScopedPtrHashMap<int, // routing_id
124 std::unique_ptr<InputHandlerWrapper>> 126 std::unique_ptr<InputHandlerWrapper>>
125 InputHandlerMap; 127 InputHandlerMap;
126 InputHandlerMap input_handlers_; 128 InputHandlerMap input_handlers_;
127 129
128 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 130 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
129 InputHandlerManagerClient* const client_; 131 InputHandlerManagerClient* const client_;
130 // May be null. 132 // May be null.
131 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_; 133 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_;
132 scheduler::RendererScheduler* const renderer_scheduler_; // Not owned. 134 scheduler::RendererScheduler* const renderer_scheduler_; // Not owned.
133 }; 135 };
134 136
135 } // namespace content 137 } // namespace content
136 138
137 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 139 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/input/input_event_filter_unittest.cc ('k') | content/renderer/input/input_handler_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698