cc: Some more cleanup and removing TODOs for validating resources.

cc/layers/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/layer_impl.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
@@ skipping 273 matching lines @@
   DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
   current_draw_mode_ = draw_mode;
   return true;
 }
 
 void LayerImpl::DidDraw(ResourceProvider* resource_provider) {
   DCHECK_NE(DRAW_MODE_NONE, current_draw_mode_);
   current_draw_mode_ = DRAW_MODE_NONE;
 }
 
+#if DCHECK_IS_ON()
+// Verify that the resource id is valid.
+static ResourceProvider::ResourceId ValidateResource(
+    const ResourceProvider* provider,
+    ResourceProvider::ResourceId id) {
+  provider->ValidateResource(id);
+  return id;
+}
+#endif
+
+void LayerImpl::ValidateQuadResources(const DrawQuad* quad) const {

[piman, 2015/04/23 22:55:10]

nit: do you think we could inline this? That way it become a no-op at the call
site.

[danakj, 2015/04/23 22:58:06]

Ya I can do this. I wanna keep the Bind call in the .cc I think, but I can add
one more function indirection.

+#if DCHECK_IS_ON()
+  output_quad->IterateResources(
+      base::Bind(&ValidateResource, layer_tree_impl_->resource_provider()));
+#endif
+}
+
 bool LayerImpl::ShowDebugBorders() const {
   return layer_tree_impl()->debug_state().show_debug_borders;
 }
 
 void LayerImpl::GetDebugBorderProperties(SkColor* color, float* width) const {
   if (draws_content_) {
     *color = DebugColors::ContentLayerBorderColor();
     *width = DebugColors::ContentLayerBorderWidth(layer_tree_impl());
     return;
   }
@@ skipping 1314 matching lines @@
   gfx::Transform scaled_draw_transform =
       draw_properties_.target_space_transform;
   scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale);
   gfx::Size scaled_content_bounds =
       gfx::ToCeiledSize(gfx::ScaleSize(content_bounds(), scale));
   return MathUtil::MapEnclosingClippedRect(scaled_draw_transform,
                                            gfx::Rect(scaled_content_bounds));
 }
 
 }  // namespace cc