Index: content/browser/renderer_host/render_widget_host_impl.h |
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h |
index 7fcf7269ec5f820edeca9313b4a62bac48b20826..3d656ee804208ccf6991a467c66f736da099d287 100644 |
--- a/content/browser/renderer_host/render_widget_host_impl.h |
+++ b/content/browser/renderer_host/render_widget_host_impl.h |
@@ -26,6 +26,7 @@ |
#include "content/browser/renderer_host/input/input_ack_handler.h" |
#include "content/browser/renderer_host/input/input_router_client.h" |
#include "content/browser/renderer_host/input/synthetic_gesture.h" |
+#include "content/browser/renderer_host/input/touch_emulator_client.h" |
#include "content/common/input/synthetic_gesture_packet.h" |
#include "content/common/view_message_enums.h" |
#include "content/port/browser/event_with_latency_info.h" |
@@ -84,6 +85,7 @@ class RenderWidgetHostDelegate; |
class RenderWidgetHostViewPort; |
class SyntheticGestureController; |
class TimeoutMonitor; |
+class TouchEmulator; |
class WebCursor; |
struct EditCommand; |
@@ -92,6 +94,7 @@ struct EditCommand; |
class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, |
public InputRouterClient, |
public InputAckHandler, |
+ public TouchEmulatorClient, |
public IPC::Listener { |
public: |
// routing_id can be MSG_ROUTING_NONE, in which case the next available |
@@ -298,13 +301,15 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, |
// Forwards the given message to the renderer. These are called by the view |
// when it has received a message. |
- void ForwardGestureEvent(const blink::WebGestureEvent& gesture_event); |
+ // Some of these methods are TouchEmulatorClient overrides. |
+ virtual void ForwardGestureEvent( |
jdduke (slow)
2014/04/07 18:12:37
It's OK to re-order the TouchEmulatorClient specif
dgozman
2014/04/08 16:56:49
Done.
|
+ const blink::WebGestureEvent& gesture_event) OVERRIDE; |
void ForwardGestureEventWithLatencyInfo( |
const blink::WebGestureEvent& gesture_event, |
const ui::LatencyInfo& ui_latency); |
- void ForwardTouchEventWithLatencyInfo( |
+ virtual void ForwardTouchEventWithLatencyInfo( |
const blink::WebTouchEvent& touch_event, |
- const ui::LatencyInfo& ui_latency); |
+ const ui::LatencyInfo& ui_latency) OVERRIDE; |
void ForwardMouseEventWithLatencyInfo( |
const blink::WebMouseEvent& mouse_event, |
const ui::LatencyInfo& ui_latency); |
@@ -312,6 +317,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, |
const blink::WebMouseWheelEvent& wheel_event, |
const ui::LatencyInfo& ui_latency); |
+ // Sets cursor to the view. TouchEmulatorClient override. |
+ virtual void SetCursor(const WebCursor& cursor) OVERRIDE; |
+ |
// Queues a synthetic gesture for testing purposes. Invokes the on_complete |
// callback when the gesture is finished running. |
void QueueSyntheticGesture( |
@@ -668,6 +676,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, |
virtual void OnFocus(); |
virtual void OnBlur(); |
void OnSetCursor(const WebCursor& cursor); |
+ void OnSetTouchEventEmulationEnabled(bool enabled); |
void OnTextInputTypeChanged(ui::TextInputType type, |
ui::TextInputMode input_mode, |
bool can_compose_inline); |
@@ -916,6 +925,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, |
scoped_ptr<SyntheticGestureController> synthetic_gesture_controller_; |
+ scoped_ptr<TouchEmulator> touch_emulator_; |
+ |
// Receives and handles all input events. |
scoped_ptr<InputRouter> input_router_; |