cc: Remove DrawQuad::IterateResoruces

cc/layers/delegated_renderer_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/delegated_renderer_layer_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 116 matching lines @@
 #if defined(COMPILER_MSVC)
   resources_in_frame.reserve(reserve_size);
 #elif defined(COMPILER_GCC)
   // Pre-standard hash-tables only implement resize, which behaves similarly
   // to reserve for these keys. Resizing to 0 may also be broken (particularly
   // on stlport).
   // TODO(jbauman): Replace with reserve when C++11 is supported everywhere.
   if (reserve_size)
     resources_in_frame.resize(reserve_size);
 #endif
-  DrawQuad::ResourceIteratorCallback remap_resources_to_parent_callback =
-      base::Bind(&ResourceRemapHelper,
-                 &invalid_frame,
-                 resource_map,
-                 &resources_in_frame);
   for (const auto& pass : render_pass_list) {
     for (const auto& quad : pass->quad_list)

[danakj, 2015/05/28 17:10:05]

{}

[vmpstr, 2015/05/28 18:38:45]

Done.

-      quad->IterateResources(remap_resources_to_parent_callback);
+      quad->IterateResources(

[danakj, 2015/05/28 17:10:05]

Does this look nicer/worse with just walking thru an array? It seems like it'd
be simpler to me, did you try it?

[piman, 2015/05/28 18:37:59]

Actually... I think we may be able to do something nice if we just add a begin()
and end() to DrawQuad::Resources, then I think we can do something like
for (ResourceId& resource_id : quad->resources()) {
  resource_id = ...
}

[vmpstr, 2015/05/28 18:38:45]

Yep, that does look better. In the current version there's no
IterateResources...

+          [&invalid_frame, &resource_map, &resources_in_frame](
+              ResourceId resource_id) {
+            return ResourceRemapHelper(&invalid_frame, resource_map,

[danakj, 2015/05/28 17:10:05]

I *think* I'd just put the body of this helper here.. unless that's difficult to
read. I'm new to lambdas.

[vmpstr, 2015/05/28 18:38:45]

Yeah, I could, but I prefer keeping lambdas very small... otherwise you're just
reading another function inside a function, which is kinda weird...

+                                       &resources_in_frame, resource_id);
+          });
   }
 
   if (invalid_frame) {
     // Declare we are still using the last frame's resources. Drops ownership of
     // any invalid resources, keeping only those in use by the active tree.
     resource_provider->DeclareUsedResourcesFromChild(child_id_, resources_);
     return;
   }
 
   // Save the new frame's resources, but don't give them to the ResourceProvider
@@ skipping 371 matching lines @@
   if (own_child_id_) {
     ResourceProvider* provider = layer_tree_impl()->resource_provider();
     provider->DestroyChild(child_id_);
   }
 
   resources_.clear();
   child_id_ = 0;
 }
 
 }  // namespace cc