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

Unified Diff: content/browser/renderer_host/input/immediate_input_router.h

Issue 45623005: [NOT FOR REVIEW] Patch demonstrating the changes required for browser side fling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 2 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/browser/renderer_host/input/immediate_input_router.h
diff --git a/content/browser/renderer_host/input/immediate_input_router.h b/content/browser/renderer_host/input/immediate_input_router.h
index 6210bf7e31fb6842328aacabe1e84908562afcca..8aaab116f1108036ea848d9bc3ca293471484a4f 100644
--- a/content/browser/renderer_host/input/immediate_input_router.h
+++ b/content/browser/renderer_host/input/immediate_input_router.h
@@ -10,10 +10,10 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "content/browser/renderer_host/input/gesture_event_filter.h"
+#include "content/browser/renderer_host/input/fling/flinger.h"
+#include "content/browser/renderer_host/input/gesture_event_filter_client.h"
#include "content/browser/renderer_host/input/input_router.h"
#include "content/browser/renderer_host/input/touch_event_queue.h"
-#include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
#include "content/public/browser/native_web_keyboard_event.h"
namespace IPC {
@@ -25,7 +25,7 @@ struct LatencyInfo;
}
namespace content {
-
+class BaseGestureEventFilter;
class InputAckHandler;
class InputRouterClient;
class OverscrollController;
@@ -37,7 +37,7 @@ class CONTENT_EXPORT ImmediateInputRouter
: public NON_EXPORTED_BASE(InputRouter),
public NON_EXPORTED_BASE(GestureEventFilterClient),
public NON_EXPORTED_BASE(TouchEventQueueClient),
- public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient) {
+ public NON_EXPORTED_BASE(FlingHelper) {
public:
ImmediateInputRouter(IPC::Sender* sender,
InputRouterClient* client,
@@ -70,7 +70,6 @@ private:
friend class ImmediateInputRouterTest;
friend class MockRenderWidgetHost;
- // TouchpadTapSuppressionControllerClient
virtual void SendMouseEventImmediately(
const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
@@ -86,6 +85,11 @@ private:
virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
InputEventAckState ack_result) OVERRIDE;
+ // FlingHelper
+ virtual void SendEventForFling(const WebKit::WebInputEvent& event) OVERRIDE;
+ virtual void FlingFinished(
+ WebKit::WebGestureEvent::SourceDevice source) OVERRIDE;
+
bool SendMoveCaret(scoped_ptr<IPC::Message> message);
bool SendSelectRange(scoped_ptr<IPC::Message> message);
bool Send(IPC::Message* message);
@@ -170,7 +174,6 @@ private:
int routing_id() const { return routing_id_; }
-
IPC::Sender* sender_;
InputRouterClient* client_;
InputAckHandler* ack_handler_;
@@ -233,7 +236,16 @@ private:
AckSource current_ack_source_;
scoped_ptr<TouchEventQueue> touch_event_queue_;
- scoped_ptr<GestureEventFilter> gesture_event_filter_;
+ scoped_ptr<Flinger> flinger_;
+
+ scoped_ptr<BaseGestureEventFilter> event_filter_;
+
+ enum InputMessageSource {
+ MESSAGE_SOURCE_FLING,
+ MESSAGE_SOURCE_REGULAR,
+ };
+
+ std::queue<InputMessageSource> in_process_messages_sources_;
DISALLOW_COPY_AND_ASSIGN(ImmediateInputRouter);
};

Powered by Google App Engine
This is Rietveld 408576698