| Index: content/browser/frame_host/render_widget_host_view_guest.h
|
| diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
|
| index 62bfb6129058289a58b284a92feb1408dce4a30d..ebf4d06b1323043bd4ef6a6c5510317a21aee6fb 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_guest.h
|
| +++ b/content/browser/frame_host/render_widget_host_view_guest.h
|
| @@ -39,8 +39,7 @@ struct NativeWebKeyboardEvent;
|
| // the relevant calls to the platform view.
|
| class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| : public RenderWidgetHostViewChildFrame,
|
| - public ui::GestureConsumer,
|
| - public ui::GestureEventHelper {
|
| + public ui::GestureConsumer {
|
| public:
|
| RenderWidgetHostViewGuest(
|
| RenderWidgetHost* widget,
|
| @@ -98,6 +97,8 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
|
| InputEventAckState ack_result) override;
|
| #endif
|
| + void ProcessTouchEvent(const blink::WebTouchEvent& event,
|
| + const ui::LatencyInfo& latency) override;
|
| bool LockMouse() override;
|
| void UnlockMouse() override;
|
| void GetScreenInfo(blink::WebScreenInfo* results) override;
|
| @@ -140,11 +141,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| void GestureEventAck(const blink::WebGestureEvent& event,
|
| InputEventAckState ack_result) override;
|
|
|
| - // Overridden from ui::GestureEventHelper.
|
| - bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
|
| - void DispatchGestureEvent(ui::GestureEvent* event) override;
|
| - void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
|
| -
|
| protected:
|
| friend class RenderWidgetHostView;
|
|
|
| @@ -165,6 +161,8 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| const gfx::Rect& guest_window_rect,
|
| const blink::WebInputEvent* event);
|
|
|
| + bool has_started_rendering_;
|
| +
|
| // BrowserPluginGuest and RenderWidgetHostViewGuest's lifetimes are not tied
|
| // to one another, therefore we access |guest_| through WeakPtr.
|
| base::WeakPtr<BrowserPluginGuest> guest_;
|
| @@ -173,9 +171,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| // RenderWidgetHostViewGuest mostly only cares about stuff related to
|
| // compositing, the rest are directly forwared to this |platform_view_|.
|
| base::WeakPtr<RenderWidgetHostViewBase> platform_view_;
|
| -#if defined(USE_AURA)
|
| - scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
|
| -#endif
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest);
|
| };
|
|
|
|
|