| Index: content/browser/renderer_host/delegated_frame_host.cc
|
| diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
|
| index 78e5ca788099f9423101c2b98495572cc9e105c2..a293b75e53821ab9a76876c3045f1f64fd1d41cd 100644
|
| --- a/content/browser/renderer_host/delegated_frame_host.cc
|
| +++ b/content/browser/renderer_host/delegated_frame_host.cc
|
| @@ -442,7 +442,7 @@ void DelegatedFrameHost::SwapDelegatedFrame(uint32_t output_surface_id,
|
|
|
| surface_factory_.reset();
|
| if (!surface_returned_resources_.empty())
|
| - SendReturnedDelegatedResources(last_output_surface_id_);
|
| + SendDelegatedFrameAck(last_output_surface_id_);
|
|
|
| last_output_surface_id_ = output_surface_id;
|
| }
|
| @@ -535,16 +535,6 @@ void DelegatedFrameHost::SurfaceDrawn(uint32_t output_surface_id,
|
| SendDelegatedFrameAck(output_surface_id);
|
| }
|
|
|
| -void DelegatedFrameHost::SendReturnedDelegatedResources(
|
| - uint32_t output_surface_id) {
|
| - cc::CompositorFrameAck ack;
|
| - DCHECK(!surface_returned_resources_.empty());
|
| - ack.resources.swap(surface_returned_resources_);
|
| -
|
| - client_->DelegatedFrameHostSendReclaimCompositorResources(output_surface_id,
|
| - ack);
|
| -}
|
| -
|
| void DelegatedFrameHost::ReturnResources(
|
| const cc::ReturnedResourceArray& resources) {
|
| if (resources.empty())
|
| @@ -552,7 +542,7 @@ void DelegatedFrameHost::ReturnResources(
|
| std::copy(resources.begin(), resources.end(),
|
| std::back_inserter(surface_returned_resources_));
|
| if (!pending_delegated_ack_count_)
|
| - SendReturnedDelegatedResources(last_output_surface_id_);
|
| + SendDelegatedFrameAck(last_output_surface_id_);
|
| }
|
|
|
| void DelegatedFrameHost::WillDrawSurface(const cc::SurfaceId& id,
|
|
|