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

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 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/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 263113a44902c9f2db46367887720c80c1fba973..7dc72701332547dd68c4d5f1bde3c4eba6d6b794 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
@@ -349,13 +349,13 @@ void RenderWidgetHostViewChildFrame::GestureEventAck(
void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck(
const cc::ReturnedResourceArray& resources) {
- renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources);
+ if (!host_)
+ return;
+ host_->SendReclaimCompositorResources(true /* is_swap_ack */, resources);
}
-void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink(
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) {
+void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() {
ResetCompositorFrameSinkSupport();
- renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
CreateCompositorFrameSinkSupport();
has_frame_ = false;
}
@@ -628,7 +628,9 @@ bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
void RenderWidgetHostViewChildFrame::ReclaimResources(
const cc::ReturnedResourceArray& resources) {
- renderer_compositor_frame_sink_->ReclaimResources(resources);
+ if (!host_)
+ return;
+ host_->SendReclaimCompositorResources(false /* is_swap_ack */, resources);
}
void RenderWidgetHostViewChildFrame::OnBeginFrame(

Powered by Google App Engine
This is Rietveld 408576698