| Index: content/renderer/input/input_handler_manager.h
|
| diff --git a/content/renderer/input/input_handler_manager.h b/content/renderer/input/input_handler_manager.h
|
| index 6905a88375b3720c8590d9bd8c6ce3ad53213b3a..86adeb70912974cb6d45c06316e1a060e61cd11e 100644
|
| --- a/content/renderer/input/input_handler_manager.h
|
| +++ b/content/renderer/input/input_handler_manager.h
|
| @@ -61,6 +61,9 @@ class InputHandlerManager {
|
| const blink::WebMouseWheelEvent& wheel_event,
|
| const cc::InputHandlerScrollResult& scroll_result);
|
|
|
| + void NonBlockingInputEventHandledOnMainThread(int routing_id,
|
| + blink::WebInputEvent::Type);
|
| +
|
| // Callback only from the compositor's thread.
|
| void RemoveInputHandler(int routing_id);
|
|
|
| @@ -92,6 +95,10 @@ class InputHandlerManager {
|
| const blink::WebMouseWheelEvent& wheel_event,
|
| const cc::InputHandlerScrollResult& scroll_result);
|
|
|
| + void NonBlockingInputEventHandledOnCompositorThread(
|
| + int routing_id,
|
| + blink::WebInputEvent::Type);
|
| +
|
| typedef base::ScopedPtrHashMap<int, // routing_id
|
| scoped_ptr<InputHandlerWrapper>>
|
| InputHandlerMap;
|
|
|