| Index: content/renderer/input/input_handler_manager.cc
|
| diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
|
| index f1f02b68179eeae85da7cd43ccb5743ec4a196a0..7666f6a7c12f627d601177c864d1652f6852477e 100644
|
| --- a/content/renderer/input/input_handler_manager.cc
|
| +++ b/content/renderer/input/input_handler_manager.cc
|
| @@ -129,6 +129,30 @@ void InputHandlerManager::RemoveInputHandler(int routing_id) {
|
| input_handlers_.erase(routing_id);
|
| }
|
|
|
| +void InputHandlerManager::AssociateRenderFrameRoutingID(
|
| + int render_frame_routing_id,
|
| + int render_view_routing_id) {
|
| + if (task_runner_->BelongsToCurrentThread()) {
|
| + AssociateRenderFrameRoutingIDOnCompositorThread(render_frame_routing_id,
|
| + render_view_routing_id);
|
| + } else {
|
| + task_runner_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&InputHandlerManager::
|
| + AssociateRenderFrameRoutingIDOnCompositorThread,
|
| + base::Unretained(this), render_frame_routing_id,
|
| + render_view_routing_id));
|
| + }
|
| +}
|
| +
|
| +void InputHandlerManager::AssociateRenderFrameRoutingIDOnCompositorThread(
|
| + int render_frame_routing_id,
|
| + int render_view_routing_id) {
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| + client_->AssociateRenderFrameRoutingID(render_frame_routing_id,
|
| + render_view_routing_id);
|
| +}
|
| +
|
| void InputHandlerManager::RegisterRoutingID(int routing_id) {
|
| if (task_runner_->BelongsToCurrentThread()) {
|
| RegisterRoutingIDOnCompositorThread(routing_id);
|
| @@ -230,6 +254,12 @@ void InputHandlerManager::HandleInputEvent(
|
| weak_ptr_factory_.GetWeakPtr(), callback));
|
| }
|
|
|
| +void InputHandlerManager::QueueClosureForMainThreadEventQueue(
|
| + int routing_id,
|
| + const base::Closure& closure) {
|
| + client_->QueueClosureForMainThreadEventQueue(routing_id, closure);
|
| +}
|
| +
|
| void InputHandlerManager::DidHandleInputEventAndOverscroll(
|
| const InputEventAckStateCallback& callback,
|
| InputHandlerProxy::EventDisposition event_disposition,
|
|
|