| Index: cc/test/render_pass_test_common.cc
|
| diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc
|
| index b66ca4fddc971a088a688bb7796abc9aadb25a7a..b2519da45e2bc50ba7b8a449a5742a937124c06d 100644
|
| --- a/cc/test/render_pass_test_common.cc
|
| +++ b/cc/test/render_pass_test_common.cc
|
| @@ -20,7 +20,7 @@
|
| namespace cc {
|
|
|
| void TestRenderPass::AppendOneOfEveryQuadType(
|
| - cc::ResourceProvider* resourceProvider) {
|
| + cc::ResourceProvider* resourceProvider, RenderPass::Id childPass) {
|
| 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};
|
| @@ -31,6 +31,31 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| ResourceProvider::TextureUsageAny);
|
| unsigned texture_id = ResourceProvider::ScopedReadLockGL(
|
| resourceProvider, texture_resource).textureId();
|
| + cc::ResourceProvider::ResourceId resource1 =
|
| + resourceProvider->createResource(
|
| + gfx::Size(45, 5),
|
| + resourceProvider->bestTextureFormat(),
|
| + ResourceProvider::TextureUsageAny);
|
| + cc::ResourceProvider::ResourceId resource2 =
|
| + resourceProvider->createResource(
|
| + gfx::Size(346, 61),
|
| + resourceProvider->bestTextureFormat(),
|
| + ResourceProvider::TextureUsageAny);
|
| + cc::ResourceProvider::ResourceId resource3 =
|
| + resourceProvider->createResource(
|
| + gfx::Size(12, 134),
|
| + resourceProvider->bestTextureFormat(),
|
| + ResourceProvider::TextureUsageAny);
|
| + cc::ResourceProvider::ResourceId resource4 =
|
| + resourceProvider->createResource(
|
| + gfx::Size(56, 12),
|
| + resourceProvider->bestTextureFormat(),
|
| + ResourceProvider::TextureUsageAny);
|
| + cc::ResourceProvider::ResourceId resource5 =
|
| + resourceProvider->createResource(
|
| + gfx::Size(73, 26),
|
| + resourceProvider->bestTextureFormat(),
|
| + ResourceProvider::TextureUsageAny);
|
|
|
| scoped_ptr<cc::SharedQuadState> shared_state = cc::SharedQuadState::Create();
|
| shared_state->SetAll(gfx::Transform(),
|
| @@ -65,19 +90,35 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| cc::IOSurfaceDrawQuad::FLIPPED);
|
| AppendQuad(io_surface_quad.PassAs<DrawQuad>());
|
|
|
| - scoped_ptr<cc::RenderPassDrawQuad> render_pass_quad =
|
| - cc::RenderPassDrawQuad::Create();
|
| - render_pass_quad->SetNew(shared_state.get(),
|
| - rect,
|
| - cc::RenderPass::Id(1, 1),
|
| - false,
|
| - 0,
|
| - rect,
|
| - gfx::RectF(),
|
| - WebKit::WebFilterOperations(),
|
| - skia::RefPtr<SkImageFilter>(),
|
| - WebKit::WebFilterOperations());
|
| - AppendQuad(render_pass_quad.PassAs<DrawQuad>());
|
| + if (childPass.layer_id) {
|
| + scoped_ptr<cc::RenderPassDrawQuad> render_pass_quad =
|
| + cc::RenderPassDrawQuad::Create();
|
| + render_pass_quad->SetNew(shared_state.get(),
|
| + rect,
|
| + childPass,
|
| + false,
|
| + resource5,
|
| + rect,
|
| + gfx::RectF(),
|
| + WebKit::WebFilterOperations(),
|
| + skia::RefPtr<SkImageFilter>(),
|
| + WebKit::WebFilterOperations());
|
| + AppendQuad(render_pass_quad.PassAs<DrawQuad>());
|
| +
|
| + scoped_ptr<cc::RenderPassDrawQuad> render_pass_replica_quad =
|
| + cc::RenderPassDrawQuad::Create();
|
| + render_pass_replica_quad->SetNew(shared_state.get(),
|
| + rect,
|
| + childPass,
|
| + true,
|
| + resource5,
|
| + rect,
|
| + gfx::RectF(),
|
| + WebKit::WebFilterOperations(),
|
| + skia::RefPtr<SkImageFilter>(),
|
| + WebKit::WebFilterOperations());
|
| + AppendQuad(render_pass_replica_quad.PassAs<DrawQuad>());
|
| + }
|
|
|
| scoped_ptr<cc::SolidColorDrawQuad> solid_color_quad =
|
| cc::SolidColorDrawQuad::Create();
|
| @@ -100,7 +141,7 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| texture_quad->SetNew(shared_state.get(),
|
| rect,
|
| opaque_rect,
|
| - texture_resource,
|
| + resource1,
|
| false,
|
| rect,
|
| vertex_opacity,
|
| @@ -112,7 +153,7 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| scaled_tile_quad->SetNew(shared_state.get(),
|
| rect,
|
| opaque_rect,
|
| - texture_resource,
|
| + resource2,
|
| gfx::RectF(0, 0, 50, 50),
|
| gfx::Size(50, 50),
|
| false,
|
| @@ -131,7 +172,7 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| transformed_tile_quad->SetNew(transformed_state.get(),
|
| rect,
|
| opaque_rect,
|
| - texture_resource,
|
| + resource3,
|
| gfx::RectF(0, 0, 100, 100),
|
| gfx::Size(100, 100),
|
| false,
|
| @@ -146,7 +187,7 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| tile_quad->SetNew(shared_state.get(),
|
| rect,
|
| opaque_rect,
|
| - texture_resource,
|
| + resource4,
|
| gfx::RectF(0, 0, 100, 100),
|
| gfx::Size(100, 100),
|
| false,
|
|
|