| Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| index bce28b8d43586cd45cbb5e8841a98baff51a5626..946e88de7ce91c7fdc161f2f4b9729d00ce4258d 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| @@ -446,10 +446,11 @@ void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck(
|
| }
|
|
|
| void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink(
|
| - viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) {
|
| + viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink,
|
| + viz::mojom::FrameInputHitTest* frame_input_hit_test) {
|
| ResetCompositorFrameSinkSupport();
|
| renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
|
| - CreateCompositorFrameSinkSupport();
|
| + CreateCompositorFrameSinkSupport(frame_input_hit_test);
|
| has_frame_ = false;
|
| }
|
|
|
| @@ -835,7 +836,8 @@ viz::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
|
| return viz::SurfaceId(frame_sink_id_, local_surface_id_);
|
| }
|
|
|
| -void RenderWidgetHostViewChildFrame::CreateCompositorFrameSinkSupport() {
|
| +void RenderWidgetHostViewChildFrame::CreateCompositorFrameSinkSupport(
|
| + viz::mojom::FrameInputHitTest* frame_input_hit_test) {
|
| if (service_manager::ServiceManagerIsRemote())
|
| return;
|
|
|
| @@ -844,8 +846,8 @@ void RenderWidgetHostViewChildFrame::CreateCompositorFrameSinkSupport() {
|
| constexpr bool handles_frame_sink_id_invalidation = false;
|
| constexpr bool needs_sync_points = true;
|
| support_ = GetHostFrameSinkManager()->CreateCompositorFrameSinkSupport(
|
| - this, frame_sink_id_, is_root, handles_frame_sink_id_invalidation,
|
| - needs_sync_points);
|
| + this, frame_input_hit_test, frame_sink_id_, is_root,
|
| + handles_frame_sink_id_invalidation, needs_sync_points);
|
| if (parent_frame_sink_id_.is_valid()) {
|
| GetHostFrameSinkManager()->RegisterFrameSinkHierarchy(parent_frame_sink_id_,
|
| frame_sink_id_);
|
|
|