| 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 ec2199f6d7467a346c1933e8019360a9e36ec47e..7ceaef919b821c9b0294036fae9c95fa9e056dd3 100644
|
| --- a/cc/test/render_pass_test_common.cc
|
| +++ b/cc/test/render_pass_test_common.cc
|
| @@ -29,48 +29,48 @@ void TestRenderPass::AppendSharedQuadState(
|
| }
|
|
|
| void TestRenderPass::AppendOneOfEveryQuadType(
|
| - cc::ResourceProvider* resourceProvider, RenderPass::Id child_pass) {
|
| + 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 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(20, 12),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(texture_resource);
|
| + resource_provider->AllocateForTesting(texture_resource);
|
| unsigned texture_id = ResourceProvider::ScopedReadLockGL(
|
| - resourceProvider, texture_resource).texture_id();
|
| + resource_provider, texture_resource).texture_id();
|
| cc::ResourceProvider::ResourceId resource1 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(45, 5),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(resource1);
|
| + resource_provider->AllocateForTesting(resource1);
|
| cc::ResourceProvider::ResourceId resource2 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(346, 61),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(resource2);
|
| + resource_provider->AllocateForTesting(resource2);
|
| cc::ResourceProvider::ResourceId resource3 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(12, 134),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(resource3);
|
| + resource_provider->AllocateForTesting(resource3);
|
| cc::ResourceProvider::ResourceId resource4 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(56, 12),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(resource4);
|
| + resource_provider->AllocateForTesting(resource4);
|
| cc::ResourceProvider::ResourceId resource5 =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(73, 26),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(resource5);
|
| + resource_provider->AllocateForTesting(resource5);
|
|
|
| scoped_ptr<cc::SharedQuadState> shared_state = cc::SharedQuadState::Create();
|
| shared_state->SetAll(gfx::Transform(),
|
| @@ -178,7 +178,8 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| scoped_ptr<cc::SharedQuadState> transformed_state = shared_state->Copy();
|
| gfx::Transform rotation;
|
| rotation.Rotate(45);
|
| - transformed_state->content_to_target_transform = transformed_state->content_to_target_transform * rotation;
|
| + transformed_state->content_to_target_transform =
|
| + transformed_state->content_to_target_transform * rotation;
|
| scoped_ptr<cc::TileDrawQuad> transformed_tile_quad =
|
| cc::TileDrawQuad::Create();
|
| transformed_tile_quad->SetNew(transformed_state.get(),
|
| @@ -204,11 +205,11 @@ void TestRenderPass::AppendOneOfEveryQuadType(
|
| cc::VideoLayerImpl::FramePlane planes[3];
|
| for (int i = 0; i < 3; ++i) {
|
| planes[i].resource_id =
|
| - resourceProvider->CreateResource(
|
| + resource_provider->CreateResource(
|
| gfx::Size(20, 12),
|
| - resourceProvider->best_texture_format(),
|
| + resource_provider->best_texture_format(),
|
| ResourceProvider::TextureUsageAny);
|
| - resourceProvider->AllocateForTesting(planes[i].resource_id);
|
| + resource_provider->AllocateForTesting(planes[i].resource_id);
|
| planes[i].size = gfx::Size(100, 100);
|
| planes[i].format = GL_LUMINANCE;
|
| }
|
|
|