cc: Move video upload to VideoResourceUpdater.

cc/test/render_pass_test_common.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/test/render_pass_test_common.h"
 
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 15 matching lines @@
 void TestRenderPass::AppendSharedQuadState(
     scoped_ptr<cc::SharedQuadState> state) {
   shared_quad_state_list.push_back(state.Pass());
 }
 
 void TestRenderPass::AppendOneOfEveryQuadType(
     cc::ResourceProvider* resource_provider, RenderPass::Id child_pass) {
   gfx::Rect rect(0, 0, 100, 100);
   gfx::Rect opaque_rect(10, 10, 80, 80);
   const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
-  cc::ResourceProvider::ResourceId texture_resource =
-      resource_provider->CreateResource(
-          gfx::Size(20, 12),
-          resource_provider->best_texture_format(),
-          ResourceProvider::TextureUsageAny);
-  resource_provider->AllocateForTesting(texture_resource);
-  unsigned texture_id = ResourceProvider::ScopedReadLockGL(
-      resource_provider, texture_resource).texture_id();
   cc::ResourceProvider::ResourceId resource1 =
       resource_provider->CreateResource(
           gfx::Size(45, 5),
           resource_provider->best_texture_format(),
           ResourceProvider::TextureUsageAny);
   resource_provider->AllocateForTesting(resource1);
   cc::ResourceProvider::ResourceId resource2 =
       resource_provider->CreateResource(
           gfx::Size(346, 61),
           resource_provider->best_texture_format(),
@@ skipping 10 matching lines @@
           gfx::Size(56, 12),
           resource_provider->best_texture_format(),
           ResourceProvider::TextureUsageAny);
   resource_provider->AllocateForTesting(resource4);
   cc::ResourceProvider::ResourceId resource5 =
       resource_provider->CreateResource(
           gfx::Size(73, 26),
           resource_provider->best_texture_format(),
           ResourceProvider::TextureUsageAny);
   resource_provider->AllocateForTesting(resource5);
+  cc::ResourceProvider::ResourceId resource6 =
+      resource_provider->CreateResource(
+          gfx::Size(64, 92),
+          resource_provider->best_texture_format(),
+          ResourceProvider::TextureUsageAny);
+  resource_provider->AllocateForTesting(resource6);
+  cc::ResourceProvider::ResourceId resource7 =
+      resource_provider->CreateResource(
+          gfx::Size(9, 14),
+          resource_provider->best_texture_format(),
+          ResourceProvider::TextureUsageAny);
+  resource_provider->AllocateForTesting(resource7);
 
   scoped_ptr<cc::SharedQuadState> shared_state = cc::SharedQuadState::Create();
   shared_state->SetAll(gfx::Transform(),
                        rect.size(),
                        rect,
                        rect,
                        false,
                        1);
 
   scoped_ptr<cc::CheckerboardDrawQuad> checkerboard_quad =
@@ skipping 10 matching lines @@
                             SK_ColorRED,
                             1);
   AppendQuad(debug_border_quad.PassAs<DrawQuad>());
 
   scoped_ptr<cc::IOSurfaceDrawQuad> io_surface_quad =
       cc::IOSurfaceDrawQuad::Create();
   io_surface_quad->SetNew(shared_state.get(),
                           rect,
                           opaque_rect,
                           gfx::Size(50, 50),
-                          texture_id,
+                          resource7,
                           cc::IOSurfaceDrawQuad::FLIPPED);
   AppendQuad(io_surface_quad.PassAs<DrawQuad>());
 
   if (child_pass.layer_id) {
     scoped_ptr<cc::RenderPassDrawQuad> render_pass_quad =
         cc::RenderPassDrawQuad::Create();
     render_pass_quad->SetNew(shared_state.get(),
                              rect,
                              child_pass,
                              false,
@@ skipping 25 matching lines @@
   solid_color_quad->SetNew(shared_state.get(),
                            rect,
                            SK_ColorRED);
   AppendQuad(solid_color_quad.PassAs<DrawQuad>());
 
   scoped_ptr<cc::StreamVideoDrawQuad> stream_video_quad =
       cc::StreamVideoDrawQuad::Create();
   stream_video_quad->SetNew(shared_state.get(),
                             rect,
                             opaque_rect,
-                            texture_id,
+                            resource6,
                             gfx::Transform());
   AppendQuad(stream_video_quad.PassAs<DrawQuad>());
 
   scoped_ptr<cc::TextureDrawQuad> texture_quad =
       cc::TextureDrawQuad::Create();
   texture_quad->SetNew(shared_state.get(),
                        rect,
                        opaque_rect,
                        resource1,
                        false,
@@ skipping 34 matching lines @@
       cc::TileDrawQuad::Create();
   tile_quad->SetNew(shared_state.get(),
                     rect,
                     opaque_rect,
                     resource4,
                     gfx::RectF(0, 0, 100, 100),
                     gfx::Size(100, 100),
                     false);
   AppendQuad(tile_quad.PassAs<DrawQuad>());
 
-  cc::VideoLayerImpl::FramePlane planes[3];
+  ResourceProvider::ResourceId plane_resources[3];
   for (int i = 0; i < 3; ++i) {
-    planes[i].resource_id =
+    plane_resources[i] =
         resource_provider->CreateResource(
             gfx::Size(20, 12),
             resource_provider->best_texture_format(),
             ResourceProvider::TextureUsageAny);
-    resource_provider->AllocateForTesting(planes[i].resource_id);
-    planes[i].size = gfx::Size(100, 100);
-    planes[i].format = GL_LUMINANCE;
+    resource_provider->AllocateForTesting(plane_resources[i]);
   }
   scoped_ptr<cc::YUVVideoDrawQuad> yuv_quad =
       cc::YUVVideoDrawQuad::Create();
   yuv_quad->SetNew(shared_state.get(),
                    rect,
                    opaque_rect,
                    gfx::Size(100, 100),
-                   planes[0],
-                   planes[1],
-                   planes[2]);
+                   plane_resources[0],
+                   plane_resources[1],
+                   plane_resources[2]);
   AppendQuad(yuv_quad.PassAs<DrawQuad>());
 
   AppendSharedQuadState(transformed_state.Pass());
   AppendSharedQuadState(shared_state.Pass());
 }
 
 }  // namespace cc