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

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

Issue 1415953004: Move content/renderer input handling for web input events to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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_wrapper.cc
diff --git a/content/renderer/input/input_handler_wrapper.cc b/content/renderer/input/input_handler_wrapper.cc
index d5596bdcc207bd2bcf91673194e2e9a84fb38351..5995d99b14aeaf8e1cb4df532d118d9c30613589 100644
--- a/content/renderer/input/input_handler_wrapper.cc
+++ b/content/renderer/input/input_handler_wrapper.cc
@@ -4,7 +4,10 @@
#include "content/renderer/input/input_handler_wrapper.h"
+#include "base/command_line.h"
#include "base/location.h"
+#include "content/common/input/did_overscroll_params.h"
+#include "content/public/common/content_switches.h"
#include "content/renderer/input/input_event_filter.h"
#include "content/renderer/input/input_handler_manager.h"
#include "third_party/WebKit/public/platform/Platform.h"
@@ -23,6 +26,9 @@ InputHandlerWrapper::InputHandlerWrapper(
main_task_runner_(main_task_runner),
render_view_impl_(render_view_impl) {
DCHECK(input_handler);
+ input_handler_proxy_.set_smooth_scroll_enabled(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableSmoothScrolling));
}
InputHandlerWrapper::~InputHandlerWrapper() {
@@ -47,7 +53,16 @@ blink::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve(
deviceSource, velocity, cumulative_scroll);
}
-void InputHandlerWrapper::DidOverscroll(const DidOverscrollParams& params) {
+void InputHandlerWrapper::DidOverscroll(
+ const gfx::Vector2dF& accumulated_overscroll,
+ const gfx::Vector2dF& latest_overscroll_delta,
+ const gfx::Vector2dF& current_fling_velocity,
+ const gfx::PointF& causal_event_viewport_point) {
+ DidOverscrollParams params;
+ params.accumulated_overscroll = accumulated_overscroll;
+ params.latest_overscroll_delta = latest_overscroll_delta;
+ params.current_fling_velocity = current_fling_velocity;
+ params.causal_event_viewport_point = causal_event_viewport_point;
input_handler_manager_->DidOverscroll(routing_id_, params);
}
« no previous file with comments | « content/renderer/input/input_handler_wrapper.h ('k') | content/renderer/input/input_scroll_elasticity_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698