Index: cc/output/delegating_renderer.cc |
diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc |
index 5892838496a25d93c4eeab2be28e5ddb9dada592..73f873e35fb53a5b4f3603eda2a2ab0f2313a66e 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,11 @@ 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) { |
+ for (ResourceId resource_id : quad->resources) |
+ resources.push_back(resource_id); |
+ } |
} |
resource_provider_->PrepareSendToParent(resources, &out_data.resource_list); |
} |