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

cc/layers/layer_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 229 matching lines @@
   // DidDraw is guaranteed to be called before another WillDraw or before
   // the layer is destroyed. To enforce this, any class that overrides
   // WillDraw/DidDraw must call the base class version only if WillDraw
   // returns true.
   virtual bool WillDraw(DrawMode draw_mode,
                         ResourceProvider* resource_provider);
   virtual void AppendQuads(RenderPass* render_pass,
                            AppendQuadsData* append_quads_data) {}
   virtual void DidDraw(ResourceProvider* resource_provider);
 
+  // Verify that the resource ids in the quad are valid.
+  void ValidateQuadResources(DrawQuad* quad) const {
+#if DCHECK_IS_ON()
+    ValidateQuadResourcesInternal(quad);
+#endif
+  }
+
   virtual void GetContentsResourceId(ResourceProvider::ResourceId* resource_id,
                                      gfx::Size* resource_size) const;
 
   virtual bool HasDelegatedContent() const;
   virtual bool HasContributingDelegatedRenderPasses() const;
   virtual RenderPassId FirstContributingRenderPassId() const;
   virtual RenderPassId NextContributingRenderPassId(RenderPassId id) const;
 
   virtual void NotifyTileStateChanged(const Tile* tile) {}
 
@@ skipping 402 matching lines @@
 
   void NoteLayerPropertyChanged();
   void NoteLayerPropertyChangedForSubtree();
 
   // Note carefully this does not affect the current layer.
   void NoteLayerPropertyChangedForDescendants();
 
   gfx::Rect GetScaledEnclosingRectInTargetSpace(float scale) const;
 
  private:
+  void ValidateQuadResourcesInternal(DrawQuad* quad) const;
+
   void PushScrollOffset(const gfx::ScrollOffset* scroll_offset);
   // If the new scroll offset is assigned from the root scroll offset delegate,
   // LayerImpl won't inform the root scroll offset delegate about the scroll
   // change to avoid feedback.
   void DidUpdateScrollOffset(bool is_from_root_delegate);
   void NoteLayerPropertyChangedForDescendantsInternal();
 
   virtual const char* LayerTypeAsString() const;
 
   // Properties internal to LayerImpl
@@ skipping 138 matching lines @@
 
   std::vector<FrameTimingRequest> frame_timing_requests_;
   bool frame_timing_requests_dirty_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_