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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.h

Issue 1412923009: Route touch-events for WebViewGuest directly to guest renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments (saving first this time). Created 5 years 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/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 d2a6466c8a73d6e2f6e7c69c2eef79935e8255a0..d345ac9e64cb555a786b01f118a42fea01927330 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,
@@ -97,6 +96,11 @@ 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;
+ void RegisterSurfaceNamespaceId();
+ void UnregisterSurfaceNamespaceId();
+
bool LockMouse() override;
void UnlockMouse() override;
void GetScreenInfo(blink::WebScreenInfo* results) override;
@@ -139,11 +143,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;
@@ -172,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);
};
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/frame_host/render_widget_host_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698