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

cc/layers/video_layer_impl.cc

 // 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.
 
 #include "cc/layers/video_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/quads/io_surface_draw_quad.h"
@@ skipping 184 matching lines @@
       DCHECK_EQ(frame_resources_.size(), 0u);
       DCHECK_EQ(software_resources_.size(), 1u);
       if (software_resources_.size() < 1u)
         break;
       bool premultiplied_alpha = true;
       gfx::PointF uv_top_left(0.f, 0.f);
       gfx::PointF uv_bottom_right(tex_width_scale, tex_height_scale);
       float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
       bool flipped = false;
       bool nearest_neighbor = false;
-      // TODO(danakj): crbug.com/455931
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          software_resources_[0]);
       TextureDrawQuad* texture_quad =
           render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
       texture_quad->SetNew(shared_quad_state,
                            quad_rect,
                            opaque_rect,
                            visible_quad_rect,
                            software_resources_[0],
                            premultiplied_alpha,
                            uv_top_left,
                            uv_bottom_right,
                            SK_ColorTRANSPARENT,
                            opacity,
                            flipped,
                            nearest_neighbor);
+      ValidateQuadResources(texture_quad);
       break;
     }
     case VideoFrameExternalResources::YUV_RESOURCE: {
       DCHECK_GE(frame_resources_.size(), 3u);
       if (frame_resources_.size() < 3u)
         break;
       YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601;
       if (frame_->format() == media::VideoFrame::YV12J) {
         color_space = YUVVideoDrawQuad::JPEG;
       } else if (frame_->format() == media::VideoFrame::YV12HD) {
         color_space = YUVVideoDrawQuad::REC_709;
       }
 
       const gfx::Size ya_tex_size = coded_size;
       const gfx::Size uv_tex_size = media::VideoFrame::PlaneSize(
           frame_->format(), media::VideoFrame::kUPlane, coded_size);
       DCHECK(uv_tex_size ==
              media::VideoFrame::PlaneSize(
                  frame_->format(), media::VideoFrame::kVPlane, coded_size));
       if (frame_resources_.size() > 3) {
         DCHECK(ya_tex_size ==
                media::VideoFrame::PlaneSize(
                    frame_->format(), media::VideoFrame::kAPlane, coded_size));
       }
 
-      // TODO(danakj): crbug.com/455931
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[0]);
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[1]);
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[2]);
-      if (frame_resources_.size() > 3) {
-        layer_tree_impl()->resource_provider()->ValidateResource(
-            frame_resources_[3]);
-      }
       gfx::RectF tex_coord_rect(
           tex_x_offset, tex_y_offset, tex_width_scale, tex_height_scale);
       YUVVideoDrawQuad* yuv_video_quad =
           render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
       yuv_video_quad->SetNew(
           shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
           tex_coord_rect, ya_tex_size, uv_tex_size, frame_resources_[0],
           frame_resources_[1], frame_resources_[2],
           frame_resources_.size() > 3 ? frame_resources_[3] : 0, color_space);
+      ValidateQuadResources(yuv_video_quad);
       break;
     }
     case VideoFrameExternalResources::RGB_RESOURCE: {
       DCHECK_EQ(frame_resources_.size(), 1u);
       if (frame_resources_.size() < 1u)
         break;
       bool premultiplied_alpha = true;
       gfx::PointF uv_top_left(0.f, 0.f);
       gfx::PointF uv_bottom_right(tex_width_scale, tex_height_scale);
       float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
       bool flipped = false;
       bool nearest_neighbor = false;
-      // TODO(danakj): crbug.com/455931
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[0]);
       TextureDrawQuad* texture_quad =
           render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
       texture_quad->SetNew(shared_quad_state,
                            quad_rect,
                            opaque_rect,
                            visible_quad_rect,
                            frame_resources_[0],
                            premultiplied_alpha,
                            uv_top_left,
                            uv_bottom_right,
                            SK_ColorTRANSPARENT,
                            opacity,
                            flipped,
                            nearest_neighbor);
+      ValidateQuadResources(texture_quad);
       break;
     }
     case VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE: {
       DCHECK_EQ(frame_resources_.size(), 1u);
       if (frame_resources_.size() < 1u)
         break;
-      // TODO(danakj): crbug.com/455931
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[0]);
       gfx::Transform scale;
       scale.Scale(tex_width_scale, tex_height_scale);
       StreamVideoDrawQuad* stream_video_quad =
           render_pass->CreateAndAppendDrawQuad<StreamVideoDrawQuad>();
       stream_video_quad->SetNew(
           shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
           frame_resources_[0],
           scale * provider_client_impl_->StreamTextureMatrix());
+      ValidateQuadResources(stream_video_quad);
       break;
     }
     case VideoFrameExternalResources::IO_SURFACE: {
       DCHECK_EQ(frame_resources_.size(), 1u);
       if (frame_resources_.size() < 1u)
         break;
-      // TODO(danakj): crbug.com/455931
-      layer_tree_impl()->resource_provider()->ValidateResource(
-          frame_resources_[0]);
       IOSurfaceDrawQuad* io_surface_quad =
           render_pass->CreateAndAppendDrawQuad<IOSurfaceDrawQuad>();
       io_surface_quad->SetNew(shared_quad_state,
                               quad_rect,
                               opaque_rect,
                               visible_quad_rect,
                               visible_rect.size(),
                               frame_resources_[0],
                               IOSurfaceDrawQuad::UNFLIPPED);
+      ValidateQuadResources(io_surface_quad);
       break;
     }
 #if defined(VIDEO_HOLE)
     // This block and other blocks wrapped around #if defined(VIDEO_HOLE) is not
     // maintained by the general compositor team. Please contact the following
     // people instead:
     //
     // wonsik@chromium.org
     // lcwu@chromium.org
     case VideoFrameExternalResources::HOLE: {
@@ skipping 53 matching lines @@
 void VideoLayerImpl::SetNeedsRedraw() {
   SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
   layer_tree_impl()->SetNeedsRedraw();
 }
 
 const char* VideoLayerImpl::LayerTypeAsString() const {
   return "cc::VideoLayerImpl";
 }
 
 }  // namespace cc