Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2457)

Unified Diff: cc/output/delegating_renderer.cc

Issue 1152473006: cc: Remove DrawQuad::IterateResoruces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iterators! Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/output/delegating_renderer.cc
diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index 5892838496a25d93c4eeab2be28e5ddb9dada592..24c604baf768793645b152996cb0004bced13836 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 (const ResourceId& resource_id : quad->resources)
piman 2015/05/28 19:35:46 nit: ResourceId instead of const ResourceId&
vmpstr 2015/05/28 22:36:59 Done.
+ resources.push_back(resource_id);
+ }
}
resource_provider_->PrepareSendToParent(resources, &out_data.resource_list);
}

Powered by Google App Engine
This is Rietveld 408576698