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

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

Issue 1780953003: Change the non-blocking event queue to the main thread event queue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_regression_5
Patch Set: Created 4 years, 9 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
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( 64 void ObserveGestureEventAndResultOnMainThread(
65 int routing_id, 65 int routing_id,
66 const blink::WebGestureEvent& gesture_event, 66 const blink::WebGestureEvent& gesture_event,
67 const cc::InputHandlerScrollResult& scroll_result); 67 const cc::InputHandlerScrollResult& scroll_result);
68 68
69 void NonBlockingInputEventHandledOnMainThread(int routing_id, 69 void NotifyInputEventHandledOnMainThread(int routing_id,
70 blink::WebInputEvent::Type); 70 blink::WebInputEvent::Type);
71 71
72 // Callback only from the compositor's thread. 72 // Callback only from the compositor's thread.
73 void RemoveInputHandler(int routing_id); 73 void RemoveInputHandler(int routing_id);
74 74
75 // Called from the compositor's thread. 75 // Called from the compositor's thread.
76 InputEventAckState HandleInputEvent(int routing_id, 76 InputEventAckState HandleInputEvent(int routing_id,
77 const blink::WebInputEvent* input_event, 77 const blink::WebInputEvent* input_event,
78 ui::LatencyInfo* latency_info); 78 ui::LatencyInfo* latency_info);
79 79
80 // Called from the compositor's thread. 80 // Called from the compositor's thread.
(...skipping 18 matching lines...) Expand all
99 void ObserveWheelEventAndResultOnCompositorThread( 99 void ObserveWheelEventAndResultOnCompositorThread(
100 int routing_id, 100 int routing_id,
101 const blink::WebMouseWheelEvent& wheel_event, 101 const blink::WebMouseWheelEvent& wheel_event,
102 const cc::InputHandlerScrollResult& scroll_result); 102 const cc::InputHandlerScrollResult& scroll_result);
103 103
104 void ObserveGestureEventAndResultOnCompositorThread( 104 void ObserveGestureEventAndResultOnCompositorThread(
105 int routing_id, 105 int routing_id,
106 const blink::WebGestureEvent& gesture_event, 106 const blink::WebGestureEvent& gesture_event,
107 const cc::InputHandlerScrollResult& scroll_result); 107 const cc::InputHandlerScrollResult& scroll_result);
108 108
109 void NonBlockingInputEventHandledOnCompositorThread( 109 void NotifyInputEventHandledOnCompositorThread(int routing_id,
110 int routing_id, 110 blink::WebInputEvent::Type);
111 blink::WebInputEvent::Type);
112 111
113 typedef base::ScopedPtrHashMap<int, // routing_id 112 typedef base::ScopedPtrHashMap<int, // routing_id
114 scoped_ptr<InputHandlerWrapper>> 113 scoped_ptr<InputHandlerWrapper>>
115 InputHandlerMap; 114 InputHandlerMap;
116 InputHandlerMap input_handlers_; 115 InputHandlerMap input_handlers_;
117 116
118 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 117 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
119 InputHandlerManagerClient* client_; 118 InputHandlerManagerClient* client_;
120 scheduler::RendererScheduler* renderer_scheduler_; // Not owned. 119 scheduler::RendererScheduler* renderer_scheduler_; // Not owned.
121 }; 120 };
122 121
123 } // namespace content 122 } // namespace content
124 123
125 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 124 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698