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

Unified Diff: content/renderer/input/input_handler_manager.cc

Issue 1749343004: Implement Wheel Gesture Scrolling on OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ensure only high precision scroll begins are used 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 side-by-side diff with in-line comments
Download patch
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 58fd95f04f8b56f9287b1c9d50432436e84e12e0..cd391cc075c29ac5aabaa9e028f97d49bb4b4a4f 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -134,6 +134,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;
@@ -144,6 +145,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) {
« no previous file with comments | « content/renderer/input/input_handler_manager.h ('k') | content/renderer/input/render_widget_input_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698