Index: cc/output/software_renderer_unittest.cc |
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc |
index dfde701bc770de6330fb679c63b889554245e902..9a3ab7096bbc675ef60a8618c3f8b4816f4ce55d 100644 |
--- a/cc/output/software_renderer_unittest.cc |
+++ b/cc/output/software_renderer_unittest.cc |
@@ -100,7 +100,7 @@ TEST_F(SoftwareRendererTest, SolidColorQuad) { |
InitializeRenderer(make_scoped_ptr(new SoftwareOutputDevice)); |
- RenderPass::Id root_render_pass_id = RenderPass::Id(1, 1); |
+ RenderPassId root_render_pass_id = RenderPassId(1, 1); |
scoped_ptr<TestRenderPass> root_render_pass = TestRenderPass::Create(); |
root_render_pass->SetNew( |
root_render_pass_id, outer_rect, outer_rect, gfx::Transform()); |
@@ -183,7 +183,7 @@ TEST_F(SoftwareRendererTest, TileQuad) { |
gfx::Rect root_rect = outer_rect; |
- RenderPass::Id root_render_pass_id = RenderPass::Id(1, 1); |
+ RenderPassId root_render_pass_id = RenderPassId(1, 1); |
scoped_ptr<TestRenderPass> root_render_pass = TestRenderPass::Create(); |
root_render_pass->SetNew( |
root_render_pass_id, root_rect, root_rect, gfx::Transform()); |
@@ -265,7 +265,7 @@ TEST_F(SoftwareRendererTest, TileQuadVisibleRect) { |
gfx::Rect root_rect(tile_size); |
- RenderPass::Id root_render_pass_id = RenderPass::Id(1, 1); |
+ RenderPassId root_render_pass_id = RenderPassId(1, 1); |
scoped_ptr<TestRenderPass> root_render_pass = TestRenderPass::Create(); |
root_render_pass->SetNew( |
root_render_pass_id, root_rect, root_rect, gfx::Transform()); |
@@ -331,7 +331,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) { |
RenderPassList list; |
// Draw a fullscreen green quad in a first frame. |
- RenderPass::Id root_clear_pass_id(1, 0); |
+ RenderPassId root_clear_pass_id(1, 0); |
TestRenderPass* root_clear_pass = AddRenderPass( |
&list, root_clear_pass_id, device_viewport_rect, gfx::Transform()); |
AddQuad(root_clear_pass, device_viewport_rect, SK_ColorGREEN); |
@@ -354,7 +354,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) { |
// frame. |
gfx::Rect smaller_rect(20, 20, 60, 60); |
- RenderPass::Id root_smaller_pass_id(2, 0); |
+ RenderPassId root_smaller_pass_id(2, 0); |
TestRenderPass* root_smaller_pass = AddRenderPass( |
&list, root_smaller_pass_id, device_viewport_rect, gfx::Transform()); |
AddQuad(root_smaller_pass, smaller_rect, SK_ColorMAGENTA); |
@@ -387,13 +387,13 @@ TEST_F(SoftwareRendererTest, RenderPassVisibleRect) { |
// Pass drawn as inner quad is magenta. |
gfx::Rect smaller_rect(20, 20, 60, 60); |
- RenderPass::Id smaller_pass_id(2, 1); |
+ RenderPassId smaller_pass_id(2, 1); |
TestRenderPass* smaller_pass = |
AddRenderPass(&list, smaller_pass_id, smaller_rect, gfx::Transform()); |
AddQuad(smaller_pass, smaller_rect, SK_ColorMAGENTA); |
// Root pass is green. |
- RenderPass::Id root_clear_pass_id(1, 0); |
+ RenderPassId root_clear_pass_id(1, 0); |
TestRenderPass* root_clear_pass = AddRenderPass( |
&list, root_clear_pass_id, device_viewport_rect, gfx::Transform()); |
AddRenderPassQuad(root_clear_pass, smaller_pass); |