Index: cc/test/render_pass_test_utils.cc |
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc |
index f803b4c838ca866771da4a629a8b019e6a865057..e9614c4e0f2d4b4cb7219ac22cbfd36358e69c6d 100644 |
--- a/cc/test/render_pass_test_utils.cc |
+++ b/cc/test/render_pass_test_utils.cc |
@@ -15,61 +15,62 @@ |
namespace cc { |
-TestRenderPass* addRenderPass(RenderPassList& passList, |
+TestRenderPass* AddRenderPass(RenderPassList& pass_list, |
RenderPass::Id id, |
- const gfx::Rect& outputRect, |
- const gfx::Transform& rootTransform) { |
+ gfx::Rect output_rect, |
+ const gfx::Transform& root_transform) { |
scoped_ptr<TestRenderPass> pass(TestRenderPass::Create()); |
- pass->SetNew(id, outputRect, outputRect, rootTransform); |
+ pass->SetNew(id, output_rect, output_rect, root_transform); |
TestRenderPass* saved = pass.get(); |
- passList.push_back(pass.PassAs<RenderPass>()); |
+ pass_list.push_back(pass.PassAs<RenderPass>()); |
return saved; |
} |
-SolidColorDrawQuad* addQuad(TestRenderPass* pass, |
- const gfx::Rect& rect, |
+SolidColorDrawQuad* AddQuad(TestRenderPass* pass, |
+ gfx::Rect rect, |
SkColor color) { |
- MockQuadCuller quadSink(&pass->quad_list, &pass->shared_quad_state_list); |
+ MockQuadCuller quad_sink(&pass->quad_list, &pass->shared_quad_state_list); |
AppendQuadsData data(pass->id); |
- SharedQuadState* sharedState = |
- quadSink.UseSharedQuadState(SharedQuadState::Create()); |
- sharedState->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1); |
+ SharedQuadState* shared_state = |
+ quad_sink.UseSharedQuadState(SharedQuadState::Create()); |
+ shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1); |
scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create(); |
- quad->SetNew(sharedState, rect, color); |
- SolidColorDrawQuad* quadPtr = quad.get(); |
- quadSink.Append(quad.PassAs<DrawQuad>(), &data); |
- return quadPtr; |
+ quad->SetNew(shared_state, rect, color); |
+ SolidColorDrawQuad* quad_ptr = quad.get(); |
+ quad_sink.Append(quad.PassAs<DrawQuad>(), &data); |
+ return quad_ptr; |
} |
-SolidColorDrawQuad* addClippedQuad(TestRenderPass* pass, |
- const gfx::Rect& rect, |
+SolidColorDrawQuad* AddClippedQuad(TestRenderPass* pass, |
+ gfx::Rect rect, |
SkColor color) { |
- MockQuadCuller quadSink(&pass->quad_list, &pass->shared_quad_state_list); |
+ MockQuadCuller quad_sink(&pass->quad_list, &pass->shared_quad_state_list); |
AppendQuadsData data(pass->id); |
- SharedQuadState* sharedState = |
- quadSink.UseSharedQuadState(SharedQuadState::Create()); |
- sharedState->SetAll(gfx::Transform(), rect.size(), rect, rect, true, 1); |
+ SharedQuadState* shared_state = |
+ quad_sink.UseSharedQuadState(SharedQuadState::Create()); |
+ shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, true, 1); |
scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create(); |
- quad->SetNew(sharedState, rect, color); |
- SolidColorDrawQuad* quadPtr = quad.get(); |
- quadSink.Append(quad.PassAs<DrawQuad>(), &data); |
- return quadPtr; |
+ quad->SetNew(shared_state, rect, color); |
+ SolidColorDrawQuad* quad_ptr = quad.get(); |
+ quad_sink.Append(quad.PassAs<DrawQuad>(), &data); |
+ return quad_ptr; |
} |
-void addRenderPassQuad(TestRenderPass* toPass, |
- TestRenderPass* contributingPass) { |
- MockQuadCuller quadSink(&toPass->quad_list, &toPass->shared_quad_state_list); |
- AppendQuadsData data(toPass->id); |
- gfx::Rect outputRect = contributingPass->output_rect; |
- SharedQuadState* sharedState = |
- quadSink.UseSharedQuadState(SharedQuadState::Create()); |
- sharedState->SetAll( |
- gfx::Transform(), outputRect.size(), outputRect, outputRect, false, 1); |
+void AddRenderPassQuad(TestRenderPass* to_pass, |
+ TestRenderPass* contributing_pass) { |
+ MockQuadCuller quad_sink(&to_pass->quad_list, |
+ &to_pass->shared_quad_state_list); |
+ AppendQuadsData data(to_pass->id); |
+ gfx::Rect output_rect = contributing_pass->output_rect; |
+ SharedQuadState* shared_state = |
+ quad_sink.UseSharedQuadState(SharedQuadState::Create()); |
+ shared_state->SetAll( |
+ gfx::Transform(), output_rect.size(), output_rect, output_rect, false, 1); |
scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); |
- quad->SetNew(sharedState, outputRect, contributingPass->id, false, 0, |
- outputRect, gfx::RectF(), WebKit::WebFilterOperations(), |
+ quad->SetNew(shared_state, output_rect, contributing_pass->id, false, 0, |
+ output_rect, gfx::RectF(), WebKit::WebFilterOperations(), |
skia::RefPtr<SkImageFilter>(), WebKit::WebFilterOperations()); |
- quadSink.Append(quad.PassAs<DrawQuad>(), &data); |
+ quad_sink.Append(quad.PassAs<DrawQuad>(), &data); |
} |
} // namespace cc |