Index: content/browser/renderer_host/render_widget_host_view_android.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h |
index 3a821be240420a4322f62d653c7ef29d743c63e4..23fc926b5e14e580d8cbc85f328b786a03998fc5 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.h |
+++ b/content/browser/renderer_host/render_widget_host_view_android.h |
@@ -135,13 +135,31 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
bool IsInVR() const override; |
void DidOverscroll(const ui::DidOverscrollParams& params) override; |
void DidStopFlinging() override; |
- cc::FrameSinkId GetFrameSinkId() override; |
void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, |
const SkBitmap& zoomed_bitmap) override; |
std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() |
override; |
void OnDidNavigateMainFrameToNewPage() override; |
void SetNeedsBeginFrames(bool needs_begin_frames) override; |
+ cc::FrameSinkId GetFrameSinkId() override; |
+ cc::FrameSinkId FrameSinkIdAtPoint(cc::SurfaceHittestDelegate* delegate, |
+ const gfx::Point& point, |
+ gfx::Point* transformed_point) override; |
+ void ProcessMouseEvent(const blink::WebMouseEvent& event, |
+ const ui::LatencyInfo& latency) override; |
+ void ProcessMouseWheelEvent(const blink::WebMouseWheelEvent& event, |
+ const ui::LatencyInfo& latency) override; |
+ void ProcessTouchEvent(const blink::WebTouchEvent& event, |
+ const ui::LatencyInfo& latency) override; |
+ void ProcessGestureEvent(const blink::WebGestureEvent& event, |
+ const ui::LatencyInfo& latency) override; |
+ bool TransformPointToLocalCoordSpace(const gfx::Point& point, |
+ const cc::SurfaceId& original_surface, |
+ gfx::Point* transformed_point) override; |
+ bool TransformPointToCoordSpaceForView( |
+ const gfx::Point& point, |
+ RenderWidgetHostViewBase* target_view, |
+ gfx::Point* transformed_point) override; |
// ui::GestureProviderClient implementation. |
void OnGestureEvent(const ui::GestureEventData& gesture) override; |
@@ -247,6 +265,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
ImeAdapterAndroid* ime_adapter_for_testing() { return &ime_adapter_android_; } |
+ // Exposed for tests. |
+ cc::SurfaceId SurfaceIdForTesting() const override; |
+ |
private: |
void RunAckCallbacks(); |