Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
index d48333d6893c5b4dc31649f89e3c849b58cdb4a2..2b0a11d2a17b90d248e7fd40e21649042cd28697 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -402,12 +402,9 @@ SkColor RenderWidgetHostViewMac::BrowserCompositorMacGetGutterColor( |
void RenderWidgetHostViewMac:: |
BrowserCompositorMacSendReclaimCompositorResources( |
- int compositor_frame_sink_id, |
bool is_swap_ack, |
const cc::ReturnedResourceArray& resources) { |
- render_widget_host_->Send(new ViewMsg_ReclaimCompositorResources( |
- render_widget_host_->GetRoutingID(), compositor_frame_sink_id, |
- is_swap_ack, resources)); |
+ render_widget_host_->SendReclaimCompositorResources(is_swap_ack, resources); |
} |
void RenderWidgetHostViewMac::BrowserCompositorMacSendBeginFrame( |
@@ -1426,8 +1423,11 @@ void RenderWidgetHostViewMac::FocusedNodeChanged( |
} |
} |
-void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
- uint32_t compositor_frame_sink_id, |
+void RenderWidgetHostViewMac::DidCreateNewRendererCompositorFrameSink() { |
+ browser_compositor_->DidCreateNewRendererCompositorFrameSink(); |
+} |
+ |
+void RenderWidgetHostViewMac::SubmitCompositorFrame( |
const cc::LocalSurfaceId& local_surface_id, |
cc::CompositorFrame frame) { |
TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame"); |
@@ -1440,8 +1440,8 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
page_at_minimum_scale_ = |
frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor; |
- browser_compositor_->SwapCompositorFrame(compositor_frame_sink_id, |
- local_surface_id, std::move(frame)); |
+ browser_compositor_->SubmitCompositorFrame(local_surface_id, |
+ std::move(frame)); |
UpdateDisplayVSyncParameters(); |
} |