cc: Move video upload to VideoResourceUpdater.

cc/quads/draw_quad_unittest.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/quads/draw_quad.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 318 matching lines @@
 
   CREATE_QUAD_2_ALL(DebugBorderDrawQuad, color, width);
   EXPECT_EQ(DrawQuad::DEBUG_BORDER, copy_quad->material);
   EXPECT_EQ(color, copy_quad->color);
   EXPECT_EQ(width, copy_quad->width);
 }
 
 TEST(DrawQuadTest, CopyIOSurfaceDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   gfx::Size size(58, 95);
-  unsigned texture_id = 72;
+  ResourceProvider::ResourceId resource_id = 72;
   IOSurfaceDrawQuad::Orientation orientation = IOSurfaceDrawQuad::UNFLIPPED;
   CREATE_SHARED_STATE();
 
   CREATE_QUAD_4_NEW(
-      IOSurfaceDrawQuad, opaque_rect, size, texture_id, orientation);
+      IOSurfaceDrawQuad, opaque_rect, size, resource_id, orientation);
   EXPECT_EQ(DrawQuad::IO_SURFACE_CONTENT, copy_quad->material);
   EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
   EXPECT_EQ(size, copy_quad->io_surface_size);
-  EXPECT_EQ(texture_id, copy_quad->io_surface_texture_id);
+  EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id);
   EXPECT_EQ(orientation, copy_quad->orientation);
 
-  CREATE_QUAD_3_ALL(IOSurfaceDrawQuad, size, texture_id, orientation);
+  CREATE_QUAD_3_ALL(IOSurfaceDrawQuad, size, resource_id, orientation);
   EXPECT_EQ(DrawQuad::IO_SURFACE_CONTENT, copy_quad->material);
   EXPECT_EQ(size, copy_quad->io_surface_size);
-  EXPECT_EQ(texture_id, copy_quad->io_surface_texture_id);
+  EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id);
   EXPECT_EQ(orientation, copy_quad->orientation);
 }
 
 TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   RenderPass::Id render_pass_id(22, 64);
   bool is_replica = true;
   ResourceProvider::ResourceId mask_resource_id = 78;
   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24);
   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
   WebKit::WebFilterOperations filters;
@@ skipping 58 matching lines @@
   EXPECT_EQ(DrawQuad::SOLID_COLOR, copy_quad->material);
   EXPECT_EQ(color, copy_quad->color);
 
   CREATE_QUAD_1_ALL(SolidColorDrawQuad, color);
   EXPECT_EQ(DrawQuad::SOLID_COLOR, copy_quad->material);
   EXPECT_EQ(color, copy_quad->color);
 }
 
 TEST(DrawQuadTest, CopyStreamVideoDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
-  unsigned texture_id = 64;
+  ResourceProvider::ResourceId resource_id = 64;
   gfx::Transform matrix = gfx::Transform(0.5, 0.25, 1, 0.75, 0, 1);
   CREATE_SHARED_STATE();
 
-  CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaque_rect, texture_id, matrix);
+  CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaque_rect, resource_id, matrix);
   EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
   EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
-  EXPECT_EQ(texture_id, copy_quad->texture_id);
+  EXPECT_EQ(resource_id, copy_quad->resource_id);
   EXPECT_EQ(matrix, copy_quad->matrix);
 
-  CREATE_QUAD_2_ALL(StreamVideoDrawQuad, texture_id, matrix);
+  CREATE_QUAD_2_ALL(StreamVideoDrawQuad, resource_id, matrix);
   EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
-  EXPECT_EQ(texture_id, copy_quad->texture_id);
+  EXPECT_EQ(resource_id, copy_quad->resource_id);
   EXPECT_EQ(matrix, copy_quad->matrix);
 }
 
 TEST(DrawQuadTest, CopyTextureDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   unsigned resource_id = 82;
   bool premultiplied_alpha = true;
   gfx::PointF uv_top_left(0.5f, 224.f);
   gfx::PointF uv_bottom_right(51.5f, 260.f);
   const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
@@ skipping 154 matching lines @@
   EXPECT_EQ(DrawQuad::TILED_CONTENT, copy_quad->material);
   EXPECT_EQ(resource_id, copy_quad->resource_id);
   EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect);
   EXPECT_EQ(texture_size, copy_quad->texture_size);
   EXPECT_EQ(swizzle_contents, copy_quad->swizzle_contents);
 }
 
 TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   gfx::SizeF tex_scale(0.75f, 0.5f);
-  VideoLayerImpl::FramePlane y_plane;
-  y_plane.resource_id = 45;
-  y_plane.size = gfx::Size(34, 23);
-  y_plane.format = 8;
-  VideoLayerImpl::FramePlane u_plane;
-  u_plane.resource_id = 532;
-  u_plane.size = gfx::Size(134, 16);
-  u_plane.format = 2;
-  VideoLayerImpl::FramePlane v_plane;
-  v_plane.resource_id = 4;
-  v_plane.size = gfx::Size(456, 486);
-  v_plane.format = 46;
+  ResourceProvider::ResourceId y_plane_resource_id = 45;
+  ResourceProvider::ResourceId u_plane_resource_id = 532;
+  ResourceProvider::ResourceId v_plane_resource_id = 4;
   CREATE_SHARED_STATE();
 
-  CREATE_QUAD_5_NEW(
-      YUVVideoDrawQuad, opaque_rect, tex_scale, y_plane, u_plane, v_plane);
+  CREATE_QUAD_5_NEW(YUVVideoDrawQuad,
+                    opaque_rect,
+                    tex_scale,
+                    y_plane_resource_id,
+                    u_plane_resource_id,
+                    v_plane_resource_id);
   EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
   EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
   EXPECT_EQ(tex_scale, copy_quad->tex_scale);
-  EXPECT_EQ(y_plane.resource_id, copy_quad->y_plane.resource_id);
-  EXPECT_EQ(y_plane.size, copy_quad->y_plane.size);
-  EXPECT_EQ(y_plane.format, copy_quad->y_plane.format);
-  EXPECT_EQ(u_plane.resource_id, copy_quad->u_plane.resource_id);
-  EXPECT_EQ(u_plane.size, copy_quad->u_plane.size);
-  EXPECT_EQ(u_plane.format, copy_quad->u_plane.format);
-  EXPECT_EQ(v_plane.resource_id, copy_quad->v_plane.resource_id);
-  EXPECT_EQ(v_plane.size, copy_quad->v_plane.size);
-  EXPECT_EQ(v_plane.format, copy_quad->v_plane.format);
+  EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id);
+  EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id);
+  EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id);
 
-  CREATE_QUAD_4_ALL(YUVVideoDrawQuad, tex_scale, y_plane, u_plane, v_plane);
+  CREATE_QUAD_4_ALL(YUVVideoDrawQuad,
+                    tex_scale,
+                    y_plane_resource_id,
+                    u_plane_resource_id,
+                    v_plane_resource_id);
   EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
   EXPECT_EQ(tex_scale, copy_quad->tex_scale);
-  EXPECT_EQ(y_plane.resource_id, copy_quad->y_plane.resource_id);
-  EXPECT_EQ(y_plane.size, copy_quad->y_plane.size);
-  EXPECT_EQ(y_plane.format, copy_quad->y_plane.format);
-  EXPECT_EQ(u_plane.resource_id, copy_quad->u_plane.resource_id);
-  EXPECT_EQ(u_plane.size, copy_quad->u_plane.size);
-  EXPECT_EQ(u_plane.format, copy_quad->u_plane.format);
-  EXPECT_EQ(v_plane.resource_id, copy_quad->v_plane.resource_id);
-  EXPECT_EQ(v_plane.size, copy_quad->v_plane.size);
-  EXPECT_EQ(v_plane.format, copy_quad->v_plane.format);
+  EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id);
+  EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id);
+  EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id);
 }
 
 TEST(DrawQuadTest, CopyPictureDrawQuad) {
   gfx::Rect opaque_rect(33, 44, 22, 33);
   gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f);
   gfx::Size texture_size(85, 32);
   bool swizzle_contents = true;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
   scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
@@ skipping 64 matching lines @@
   int width = 99;
 
   CREATE_SHARED_STATE();
   CREATE_QUAD_2_NEW(DebugBorderDrawQuad, color, width);
   EXPECT_EQ(0, IterateAndCount(quad_new.get()));
 }
 
 TEST_F(DrawQuadIteratorTest, IOSurfaceDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   gfx::Size size(58, 95);
-  unsigned texture_id = 72;
+  ResourceProvider::ResourceId resource_id = 72;
   IOSurfaceDrawQuad::Orientation orientation = IOSurfaceDrawQuad::UNFLIPPED;
 
   CREATE_SHARED_STATE();
   CREATE_QUAD_4_NEW(
-      IOSurfaceDrawQuad, opaque_rect, size, texture_id, orientation);
-  EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+      IOSurfaceDrawQuad, opaque_rect, size, resource_id, orientation);
+  EXPECT_EQ(resource_id, quad_new->io_surface_resource_id);
+  EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+  EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id);
 }
 
 TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
   RenderPass::Id render_pass_id(22, 64);
   bool is_replica = true;
   ResourceProvider::ResourceId mask_resource_id = 78;
   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24);
   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
   WebKit::WebFilterOperations filters;
   filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f));
@@ skipping 24 matching lines @@
 TEST_F(DrawQuadIteratorTest, SolidColorDrawQuad) {
   SkColor color = 0x49494949;
 
   CREATE_SHARED_STATE();
   CREATE_QUAD_1_NEW(SolidColorDrawQuad, color);
   EXPECT_EQ(0, IterateAndCount(quad_new.get()));
 }
 
 TEST_F(DrawQuadIteratorTest, StreamVideoDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
-  unsigned texture_id = 64;
+  ResourceProvider::ResourceId resource_id = 64;
   gfx::Transform matrix = gfx::Transform(0.5, 0.25, 1, 0.75, 0, 1);
 
   CREATE_SHARED_STATE();
-  CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaque_rect, texture_id, matrix);
-  EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+  CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaque_rect, resource_id, matrix);
+  EXPECT_EQ(resource_id, quad_new->resource_id);
+  EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+  EXPECT_EQ(resource_id + 1, quad_new->resource_id);
 }
 
 TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   unsigned resource_id = 82;
   bool premultiplied_alpha = true;
   gfx::PointF uv_top_left(0.5f, 224.f);
   gfx::PointF uv_bottom_right(51.5f, 260.f);
   const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
   bool flipped = true;
@@ skipping 27 matching lines @@
                     texture_size,
                     swizzle_contents);
   EXPECT_EQ(resource_id, quad_new->resource_id);
   EXPECT_EQ(1, IterateAndCount(quad_new.get()));
   EXPECT_EQ(resource_id + 1, quad_new->resource_id);
 }
 
 TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
   gfx::Rect opaque_rect(3, 7, 10, 12);
   gfx::SizeF tex_scale(0.75f, 0.5f);
-  VideoLayerImpl::FramePlane y_plane;
-  y_plane.resource_id = 45;
-  y_plane.size = gfx::Size(34, 23);
-  y_plane.format = 8;
-  VideoLayerImpl::FramePlane u_plane;
-  u_plane.resource_id = 532;
-  u_plane.size = gfx::Size(134, 16);
-  u_plane.format = 2;
-  VideoLayerImpl::FramePlane v_plane;
-  v_plane.resource_id = 4;
-  v_plane.size = gfx::Size(456, 486);
-  v_plane.format = 46;
+  ResourceProvider::ResourceId y_plane_resource_id = 45;
+  ResourceProvider::ResourceId u_plane_resource_id = 532;
+  ResourceProvider::ResourceId v_plane_resource_id = 4;
 
   CREATE_SHARED_STATE();
-  CREATE_QUAD_5_NEW(
-      YUVVideoDrawQuad, opaque_rect, tex_scale, y_plane, u_plane, v_plane);
+  CREATE_QUAD_5_NEW(YUVVideoDrawQuad,
+                    opaque_rect,
+                    tex_scale,
+                    y_plane_resource_id,
+                    u_plane_resource_id,
+                    v_plane_resource_id);
   EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
-  EXPECT_EQ(y_plane.resource_id, quad_new->y_plane.resource_id);
-  EXPECT_EQ(u_plane.resource_id, quad_new->u_plane.resource_id);
-  EXPECT_EQ(v_plane.resource_id, quad_new->v_plane.resource_id);
+  EXPECT_EQ(y_plane_resource_id, quad_new->y_plane_resource_id);
+  EXPECT_EQ(u_plane_resource_id, quad_new->u_plane_resource_id);
+  EXPECT_EQ(v_plane_resource_id, quad_new->v_plane_resource_id);
   EXPECT_EQ(3, IterateAndCount(quad_new.get()));
-  EXPECT_EQ(y_plane.resource_id + 1, quad_new->y_plane.resource_id);
-  EXPECT_EQ(u_plane.resource_id + 1, quad_new->u_plane.resource_id);
-  EXPECT_EQ(v_plane.resource_id + 1, quad_new->v_plane.resource_id);
+  EXPECT_EQ(y_plane_resource_id + 1, quad_new->y_plane_resource_id);
+  EXPECT_EQ(u_plane_resource_id + 1, quad_new->u_plane_resource_id);
+  EXPECT_EQ(v_plane_resource_id + 1, quad_new->v_plane_resource_id);
 }
 
 TEST_F(DrawQuadIteratorTest, PictureDrawQuad) {
   gfx::Rect opaque_rect(33, 44, 22, 33);
   gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f);
   gfx::Size texture_size(85, 32);
   bool swizzle_contents = true;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
   scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
 
   CREATE_SHARED_STATE();
   CREATE_QUAD_7_NEW(PictureDrawQuad,
                     opaque_rect,
                     tex_coord_rect,
                     texture_size,
                     swizzle_contents,
                     content_rect,
                     contents_scale,
                     picture_pile);
   EXPECT_EQ(0, IterateAndCount(quad_new.get()));
 }
 
 }  // namespace
 }  // namespace cc