| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index 96000155b641ec3b08d8cb49b1ba20e4038c0c64..e111e6cb5ae5e6e6df31a2d2dc978a4cd7b816fa 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -421,9 +421,10 @@ RenderWidgetHostImpl* RenderWidgetHostImpl::From(RenderWidgetHost* rwh) {
|
| void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
|
| if (view) {
|
| view_ = view->GetWeakPtr();
|
| - if (renderer_compositor_frame_sink_.is_bound()) {
|
| + if (renderer_compositor_frame_sink_.is_bound() &&
|
| + frame_hit_test_.is_bound()) {
|
| view->DidCreateNewRendererCompositorFrameSink(
|
| - renderer_compositor_frame_sink_.get());
|
| + renderer_compositor_frame_sink_.get(), frame_hit_test_.get());
|
| }
|
| // Views start out not needing begin frames, so only update its state
|
| // if the value has changed.
|
| @@ -2550,15 +2551,18 @@ void RenderWidgetHostImpl::RequestCompositionUpdates(bool immediate_request,
|
|
|
| void RenderWidgetHostImpl::RequestCompositorFrameSink(
|
| viz::mojom::CompositorFrameSinkRequest request,
|
| - viz::mojom::CompositorFrameSinkClientPtr client) {
|
| + viz::mojom::CompositorFrameSinkClientPtr client,
|
| + viz::mojom::FrameInputHitTestPtr hit_test) {
|
| if (compositor_frame_sink_binding_.is_bound())
|
| compositor_frame_sink_binding_.Close();
|
| compositor_frame_sink_binding_.Bind(
|
| std::move(request),
|
| BrowserMainLoop::GetInstance()->GetResizeTaskRunner());
|
| if (view_)
|
| - view_->DidCreateNewRendererCompositorFrameSink(client.get());
|
| + view_->DidCreateNewRendererCompositorFrameSink(client.get(),
|
| + hit_test.get());
|
| renderer_compositor_frame_sink_ = std::move(client);
|
| + frame_hit_test_ = std::move(hit_test);
|
| }
|
|
|
| bool RenderWidgetHostImpl::HasGestureStopped() {
|
|
|