| Index: cc/output/delegating_renderer.cc
|
| diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
|
| index 5892838496a25d93c4eeab2be28e5ddb9dada592..30644b068f6332f754d3f526cb4808dbb1ffbd19 100644
|
| --- a/cc/output/delegating_renderer.cc
|
| +++ b/cc/output/delegating_renderer.cc
|
| @@ -66,12 +66,6 @@ const RendererCapabilitiesImpl& DelegatingRenderer::Capabilities() const {
|
| return capabilities_;
|
| }
|
|
|
| -static ResourceId AppendToArray(ResourceProvider::ResourceIdArray* array,
|
| - ResourceId id) {
|
| - array->push_back(id);
|
| - return id;
|
| -}
|
| -
|
| void DelegatingRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order,
|
| float device_scale_factor,
|
| const gfx::Rect& device_viewport_rect,
|
| @@ -89,11 +83,13 @@ void DelegatingRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order,
|
|
|
| // Collect all resource ids in the render passes into a ResourceIdArray.
|
| ResourceProvider::ResourceIdArray resources;
|
| - DrawQuad::ResourceIteratorCallback append_to_array =
|
| - base::Bind(&AppendToArray, &resources);
|
| for (const auto& render_pass : out_data.render_pass_list) {
|
| - for (const auto& quad : render_pass->quad_list)
|
| - quad->IterateResources(append_to_array);
|
| + for (const auto& quad : render_pass->quad_list) {
|
| + quad->IterateResources([&resources](ResourceId resource_id) {
|
| + resources.push_back(resource_id);
|
| + return resource_id;
|
| + });
|
| + }
|
| }
|
| resource_provider_->PrepareSendToParent(resources, &out_data.resource_list);
|
| }
|
|
|