summaryrefslogtreecommitdiffstats
path: root/cc/output
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 21:15:06 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 21:15:06 +0000
commitbf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d (patch)
treedba84d59df6abc81803ce0191ccb78c42d4ca55b /cc/output
parent01fc514f488305c0c57038c3d5c7b28eb09df4cd (diff)
downloadchromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.zip
chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.gz
chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.bz2
Fix cpplint errors in cc/(animation|input|layers|trees|test)/
This fixes lint errors in everything except for the few stragglers (occlusion unit test, etc) that haven't been chromified. BUG=144577 Review URL: https://chromiumcodereview.appspot.com/12965007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output')
-rw-r--r--cc/output/delegating_renderer_unittest.cc4
-rw-r--r--cc/output/gl_renderer_unittest.cc12
-rw-r--r--cc/output/software_renderer_unittest.cc4
3 files changed, 10 insertions, 10 deletions
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc
index c0b8dff..988ab3c 100644
--- a/cc/output/delegating_renderer_unittest.cc
+++ b/cc/output/delegating_renderer_unittest.cc
@@ -96,7 +96,7 @@ class DelegatingRendererTestResources : public DelegatingRendererTest {
frame->render_passes_by_id.clear();
TestRenderPass* child_pass = AddRenderPass(
- frame->render_passes,
+ &frame->render_passes,
RenderPass::Id(2, 1),
gfx::Rect(3, 3, 10, 10),
gfx::Transform());
@@ -104,7 +104,7 @@ class DelegatingRendererTestResources : public DelegatingRendererTest {
host_impl->resource_provider(), RenderPass::Id(0, 0));
TestRenderPass* pass = AddRenderPass(
- frame->render_passes,
+ &frame->render_passes,
RenderPass::Id(1, 1),
gfx::Rect(3, 3, 10, 10),
gfx::Transform());
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 8ebcd4d..21a00d0 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -813,12 +813,12 @@ TEST(GLRendererTest2, ShouldClearRootRenderPass) {
RenderPass::Id root_pass_id(1, 0);
TestRenderPass* root_pass = AddRenderPass(
- render_passes, root_pass_id, viewport_rect, gfx::Transform());
+ &render_passes, root_pass_id, viewport_rect, gfx::Transform());
AddQuad(root_pass, viewport_rect, SK_ColorGREEN);
RenderPass::Id child_pass_id(2, 0);
TestRenderPass* child_pass = AddRenderPass(
- render_passes, child_pass_id, viewport_rect, gfx::Transform());
+ &render_passes, child_pass_id, viewport_rect, gfx::Transform());
AddQuad(child_pass, viewport_rect, SK_ColorBLUE);
AddRenderPassQuad(root_pass, child_pass);
@@ -885,18 +885,18 @@ TEST(GLRendererTest2, ScissorTestWhenClearing) {
gfx::Rect grand_child_rect(25, 25);
RenderPass::Id grand_child_pass_id(3, 0);
TestRenderPass* grand_child_pass = AddRenderPass(
- render_passes, grand_child_pass_id, grand_child_rect, gfx::Transform());
+ & render_passes, grand_child_pass_id, grand_child_rect, gfx::Transform());
AddClippedQuad(grand_child_pass, grand_child_rect, SK_ColorYELLOW);
gfx::Rect child_rect(50, 50);
RenderPass::Id child_pass_id(2, 0);
TestRenderPass* child_pass =
- AddRenderPass(render_passes, child_pass_id, child_rect, gfx::Transform());
+ AddRenderPass(&render_passes, child_pass_id, child_rect, gfx::Transform());
AddQuad(child_pass, child_rect, SK_ColorBLUE);
RenderPass::Id root_pass_id(1, 0);
TestRenderPass* root_pass = AddRenderPass(
- render_passes, root_pass_id, viewport_rect, gfx::Transform());
+ & render_passes, root_pass_id, viewport_rect, gfx::Transform());
AddQuad(root_pass, viewport_rect, SK_ColorGREEN);
AddRenderPassQuad(root_pass, child_pass);
@@ -965,7 +965,7 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient {
RenderPass::Id render_pass_id(1, 0);
TestRenderPass* render_pass = AddRenderPass(
- *render_passes, render_pass_id, viewport_rect, gfx::Transform());
+ render_passes, render_pass_id, viewport_rect, gfx::Transform());
AddQuad(render_pass, viewport_rect, SK_ColorGREEN);
EXPECT_CALL(output_surface_, EnsureBackbuffer()).WillRepeatedly(Return());
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index 259805f..ae524dc 100644
--- a/cc/output/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -218,7 +218,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) {
// Draw a fullscreen green quad in a first frame.
RenderPass::Id root_clear_pass_id(1, 0);
TestRenderPass* root_clear_pass =
- AddRenderPass(list, root_clear_pass_id, viewport_rect, gfx::Transform());
+ AddRenderPass(&list, root_clear_pass_id, viewport_rect, gfx::Transform());
AddQuad(root_clear_pass, viewport_rect, SK_ColorGREEN);
renderer()->DecideRenderPassAllocationsForFrame(list);
@@ -236,7 +236,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) {
RenderPass::Id root_smaller_pass_id(2, 0);
TestRenderPass* root_smaller_pass = AddRenderPass(
- list, root_smaller_pass_id, viewport_rect, gfx::Transform());
+ &list, root_smaller_pass_id, viewport_rect, gfx::Transform());
AddQuad(root_smaller_pass, smaller_rect, SK_ColorMAGENTA);
renderer()->DecideRenderPassAllocationsForFrame(list);