summaryrefslogtreecommitdiffstats
path: root/content/renderer/input/input_handler_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/renderer/input/input_handler_manager.cc')
-rw-r--r--content/renderer/input/input_handler_manager.cc27
1 files changed, 27 insertions, 0 deletions
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index 5f1bfe0..b249a64 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -144,6 +144,7 @@ void InputHandlerManager::ObserveWheelEventAndResultOnCompositorThread(
int routing_id,
const blink::WebMouseWheelEvent& wheel_event,
const cc::InputHandlerScrollResult& scroll_result) {
+ DCHECK(task_runner_->BelongsToCurrentThread());
auto it = input_handlers_.find(routing_id);
if (it == input_handlers_.end())
return;
@@ -154,6 +155,32 @@ void InputHandlerManager::ObserveWheelEventAndResultOnCompositorThread(
wheel_event, scroll_result);
}
+void InputHandlerManager::ObserveGestureEventAndResultOnMainThread(
+ int routing_id,
+ const blink::WebGestureEvent& gesture_event,
+ const cc::InputHandlerScrollResult& scroll_result) {
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(
+ &InputHandlerManager::ObserveGestureEventAndResultOnCompositorThread,
+ base::Unretained(this), routing_id, gesture_event, scroll_result));
+}
+
+void InputHandlerManager::ObserveGestureEventAndResultOnCompositorThread(
+ int routing_id,
+ const blink::WebGestureEvent& gesture_event,
+ const cc::InputHandlerScrollResult& scroll_result) {
+ DCHECK(task_runner_->BelongsToCurrentThread());
+ auto it = input_handlers_.find(routing_id);
+ if (it == input_handlers_.end())
+ return;
+
+ InputHandlerProxy* proxy = it->second->input_handler_proxy();
+ DCHECK(proxy->scroll_elasticity_controller());
+ proxy->scroll_elasticity_controller()->ObserveGestureEventAndResult(
+ gesture_event, scroll_result);
+}
+
void InputHandlerManager::NonBlockingInputEventHandledOnMainThread(
int routing_id,
blink::WebInputEvent::Type type) {