| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 37703597428fad1fafb687a97ff174fb5ce07c12..98f30281ff309477dcfcfc4b527f0688f439dcc1 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -944,17 +944,6 @@ void RenderWidgetHostViewAndroid::SendDelegatedFrameAck(
|
| output_surface_id, ack));
|
| }
|
|
|
| -void RenderWidgetHostViewAndroid::SendReturnedDelegatedResources(
|
| - uint32_t output_surface_id) {
|
| - DCHECK(host_);
|
| - cc::CompositorFrameAck ack;
|
| - DCHECK(!surface_returned_resources_.empty());
|
| - ack.resources.swap(surface_returned_resources_);
|
| -
|
| - host_->Send(new ViewMsg_ReclaimCompositorResources(host_->GetRoutingID(),
|
| - output_surface_id, ack));
|
| -}
|
| -
|
| void RenderWidgetHostViewAndroid::ReturnResources(
|
| const cc::ReturnedResourceArray& resources) {
|
| if (resources.empty())
|
| @@ -962,7 +951,7 @@ void RenderWidgetHostViewAndroid::ReturnResources(
|
| std::copy(resources.begin(), resources.end(),
|
| std::back_inserter(surface_returned_resources_));
|
| if (ack_callbacks_.empty())
|
| - SendReturnedDelegatedResources(last_output_surface_id_);
|
| + SendDelegatedFrameAck(last_output_surface_id_);
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::SetBeginFrameSource(
|
| @@ -987,7 +976,7 @@ void RenderWidgetHostViewAndroid::CheckOutputSurfaceChanged(
|
| DestroyDelegatedContent();
|
| 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;
|
| }
|
|
|