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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2951053005: Add Mojo API for Blink hit testing (Closed)
Patch Set: Address Rob's comments Created 3 years, 4 months 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/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..975a826a645d7dbee535f6f0d9f2d3773d8f292e 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -421,9 +421,11 @@ 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() &&
+ target_frame_for_input_delegate_.is_bound()) {
view->DidCreateNewRendererCompositorFrameSink(
- renderer_compositor_frame_sink_.get());
+ renderer_compositor_frame_sink_.get(),
+ target_frame_for_input_delegate_.get());
}
// Views start out not needing begin frames, so only update its state
// if the value has changed.
@@ -2550,15 +2552,18 @@ void RenderWidgetHostImpl::RequestCompositionUpdates(bool immediate_request,
void RenderWidgetHostImpl::RequestCompositorFrameSink(
viz::mojom::CompositorFrameSinkRequest request,
- viz::mojom::CompositorFrameSinkClientPtr client) {
+ viz::mojom::CompositorFrameSinkClientPtr client,
+ viz::mojom::TargetFrameForInputDelegatePtr input_delegate) {
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(),
+ input_delegate.get());
renderer_compositor_frame_sink_ = std::move(client);
+ target_frame_for_input_delegate_ = std::move(input_delegate);
}
bool RenderWidgetHostImpl::HasGestureStopped() {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698