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

cc/layers/painted_scrollbar_layer_impl.cc

 // Copyright 2013 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/painted_scrollbar_layer_impl.h"
 
 #include <algorithm>
 
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/layers/layer.h"
@@ skipping 85 matching lines @@
       visible_thumb_quad_rect, internal_contents_scale_);
 
   ResourceProvider::ResourceId thumb_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_);
   ResourceProvider::ResourceId track_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_);
 
   if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
     gfx::Rect opaque_rect;
     const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
-    // TODO(danakj): crbug.com/455931
-    layer_tree_impl()->resource_provider()->ValidateResource(thumb_resource_id);
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect,
                  scaled_visible_thumb_quad_rect, thumb_resource_id,
                  premultipled_alpha, uv_top_left, uv_bottom_right,
                  SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 
   gfx::Rect track_quad_rect(bounds());
   gfx::Rect scaled_track_quad_rect(internal_content_bounds_);
   gfx::Rect visible_track_quad_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           track_quad_rect);
   gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect(
       visible_track_quad_rect, internal_contents_scale_);
   if (track_resource_id && !visible_track_quad_rect.IsEmpty()) {
     gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect
                                             : gfx::Rect());
     const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
-    // TODO(danakj): crbug.com/455931
-    layer_tree_impl()->resource_provider()->ValidateResource(track_resource_id);
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect,
                  scaled_visible_track_quad_rect, track_resource_id,
                  premultipled_alpha, uv_top_left, uv_bottom_right,
                  SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+    ValidateQuadResources(quad);
   }
 }
 
 gfx::Rect PaintedScrollbarLayerImpl::GetEnclosingRectInTargetSpace() const {
   return GetScaledEnclosingRectInTargetSpace(internal_contents_scale_);
 }
 
 void PaintedScrollbarLayerImpl::SetThumbThickness(int thumb_thickness) {
   if (thumb_thickness_ == thumb_thickness)
     return;
@@ skipping 40 matching lines @@
 
 bool PaintedScrollbarLayerImpl::IsThumbResizable() const {
   return false;
 }
 
 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const {
   return "cc::PaintedScrollbarLayerImpl";
 }
 
 }  // namespace cc