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

cc/layers/nine_patch_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/nine_patch_layer_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 82 matching lines @@
 
   if (!ui_resource_id_)
     return;
 
   ResourceProvider::ResourceId resource =
       layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_);
 
   if (!resource)
     return;
 
-  // TODO(danakj): crbug.com/455931
-  layer_tree_impl()->resource_provider()->ValidateResource(resource);
-
   static const bool flipped = false;
   static const bool nearest_neighbor = false;
   static const bool premultiplied_alpha = true;
 
   DCHECK(!bounds().IsEmpty());
 
   // NinePatch border widths in layer space.
   int layer_left_width = border_.x();
   int layer_top_height = border_.y();
   int layer_right_width = border_.width() - layer_left_width;
@@ skipping 111 matching lines @@
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_left.origin(),
                  uv_top_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_top_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_right.origin(),
                  uv_top_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_bottom_left);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_left.origin(),
                  uv_bottom_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_bottom_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_right.origin(),
                  uv_bottom_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_top);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top.origin(),
                  uv_top.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_left);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_left.origin(),
                  uv_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_right);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_right,
                  opaque_rect,
                  layer_right,
                  resource,
                  premultiplied_alpha,
                  uv_right.origin(),
                  uv_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   visible_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           layer_bottom);
   opaque_rect = opaque ? visible_rect : gfx::Rect();
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom.origin(),
                  uv_bottom.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped,
                  nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   if (fill_center_) {
     visible_rect =
         draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
             layer_center);
     opaque_rect = opaque ? visible_rect : gfx::Rect();
     if (!visible_rect.IsEmpty()) {
       TextureDrawQuad* quad =
           render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
       quad->SetNew(shared_quad_state,
                    layer_center,
                    opaque_rect,
                    visible_rect,
                    resource,
                    premultiplied_alpha,
                    uv_center.origin(),
                    uv_center.bottom_right(),
                    SK_ColorTRANSPARENT,
                    vertex_opacity,
                    flipped,
                    nearest_neighbor);
+      ValidateQuadResources(quad);
     }
   }
 }
 
 const char* NinePatchLayerImpl::LayerTypeAsString() const {
   return "cc::NinePatchLayerImpl";
 }
 
 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = LayerImpl::LayerTreeAsJson();
@@ skipping 11 matching lines @@
   result->Set("ImageBounds", list);
 
   result->Set("Border", MathUtil::AsValue(border_).release());
 
   result->SetBoolean("FillCenter", fill_center_);
 
   return result;
 }
 
 }  // namespace cc