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

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

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.h
diff --git a/content/renderer/input/input_handler_wrapper.h b/content/renderer/input/input_handler_wrapper.h
index 5c925d0515bea1f713d9fc15e65c14896982f2f3..69ff5c67115c9b892328924f0031504d8de1d8bd 100644
--- a/content/renderer/input/input_handler_wrapper.h
+++ b/content/renderer/input/input_handler_wrapper.h
@@ -8,13 +8,18 @@
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "content/renderer/input/input_handler_manager.h"
-#include "content/renderer/input/input_handler_proxy.h"
-#include "content/renderer/input/input_handler_proxy_client.h"
+#include "ui/events/blink/input_handler_proxy.h"
+#include "ui/events/blink/input_handler_proxy_client.h"
+
+namespace ui {
+class InputHandlerProxy;
+class InputHandlerProxyClient;
+}
namespace content {
// This class lives on the compositor thread.
-class InputHandlerWrapper : public InputHandlerProxyClient {
+class InputHandlerWrapper : public ui::InputHandlerProxyClient {
public:
InputHandlerWrapper(
InputHandlerManager* input_handler_manager,
@@ -25,7 +30,9 @@ class InputHandlerWrapper : public InputHandlerProxyClient {
~InputHandlerWrapper() override;
int routing_id() const { return routing_id_; }
- InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; }
+ ui::InputHandlerProxy* input_handler_proxy() {
+ return &input_handler_proxy_;
+ }
// InputHandlerProxyClient implementation.
void WillShutdown() override;
@@ -35,14 +42,18 @@ class InputHandlerWrapper : public InputHandlerProxyClient {
blink::WebGestureDevice deviceSource,
const blink::WebFloatPoint& velocity,
const blink::WebSize& cumulativeScroll) override;
- void DidOverscroll(const DidOverscrollParams& params) override;
+ void 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) override;
void DidStopFlinging() override;
void DidAnimateForInput() override;
private:
InputHandlerManager* input_handler_manager_;
int routing_id_;
- InputHandlerProxy input_handler_proxy_;
+ ui::InputHandlerProxy input_handler_proxy_;
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
// Can only be accessed on the main thread.
« no previous file with comments | « content/renderer/input/input_handler_proxy_unittest.cc ('k') | content/renderer/input/input_handler_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698