Index: content/renderer/gpu/input_event_filter.h |
diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h |
index b4526200c2f2685863ee62f5c06fe47c94c6e3bf..e8ca0d4f1120f0732d03d72e9123580cbfcf83c8 100644 |
--- a/content/renderer/gpu/input_event_filter.h |
+++ b/content/renderer/gpu/input_event_filter.h |
@@ -11,8 +11,9 @@ |
#include "base/callback_forward.h" |
#include "base/synchronization/lock.h" |
#include "content/common/content_export.h" |
-#include "content/port/common/input_event_ack_state.h" |
+#include "content/common/input/input_event_disposition.h" |
#include "content/renderer/gpu/input_handler_manager_client.h" |
+#include "content/renderer/gpu/renderer_event_packet.h" |
#include "ipc/ipc_channel_proxy.h" |
#include "third_party/WebKit/public/web/WebInputEvent.h" |
@@ -26,9 +27,13 @@ |
namespace content { |
+class InputEvent; |
+class EventPacketHandler; |
+ |
class CONTENT_EXPORT InputEventFilter |
: public InputHandlerManagerClient, |
- public IPC::ChannelProxy::MessageFilter { |
+ public IPC::ChannelProxy::MessageFilter, |
+ NON_EXPORTED_BASE(public RendererEventPacket::Dispatcher) { |
public: |
InputEventFilter(IPC::Listener* main_listener, |
const scoped_refptr<base::MessageLoopProxy>& target_loop); |
@@ -60,13 +65,20 @@ class CONTENT_EXPORT InputEventFilter |
friend class IPC::ChannelProxy::MessageFilter; |
virtual ~InputEventFilter(); |
- void ForwardToMainListener(const IPC::Message& message); |
void ForwardToHandler(const IPC::Message& message); |
- void SendACK(WebKit::WebInputEvent::Type type, |
- InputEventAckState ack_result, |
- const ui::LatencyInfo& latency_info, |
- int routing_id); |
- void SendMessageOnIOThread(const IPC::Message& message); |
+ void ForwardToMainListener(const IPC::Message& message); |
+ void ForwardToMainListenerOnMainThread(const IPC::Message& message); |
+ void OnHandleInputEvent(const IPC::Message& message); |
+ void OnHandleEventPacket(const IPC::Message& message); |
+ void Send(IPC::Message* message); |
+ void SendOnIOThread(scoped_ptr<IPC::Message> message); |
+ |
+ // RendererEventPacket::Dispatcher |
+ virtual InputEventDisposition Dispatch(const IPC::Message& message) OVERRIDE; |
+ virtual InputEventDisposition Dispatch(int routing_id, |
+ const WebKit::WebInputEvent* web_event, |
+ const ui::LatencyInfo& latency_info, |
+ bool is_keyboard_shortcut) OVERRIDE; |
scoped_refptr<base::MessageLoopProxy> main_loop_; |
IPC::Listener* main_listener_; |