| Index: cc/surfaces/surfaces_pixeltest.cc
|
| diff --git a/cc/surfaces/surfaces_pixeltest.cc b/cc/surfaces/surfaces_pixeltest.cc
|
| index bd9f56c7556c309ce63329ca6017f78665b80ef6..a30f017247bf0f4ca4fded7e7f35ee20098a6398 100644
|
| --- a/cc/surfaces/surfaces_pixeltest.cc
|
| +++ b/cc/surfaces/surfaces_pixeltest.cc
|
| @@ -63,7 +63,7 @@ SharedQuadState* CreateAndAppendTestSharedQuadState(
|
| // Draws a very simple frame with no surface references.
|
| TEST_F(SurfacesPixelTest, DrawSimpleFrame) {
|
| gfx::Rect rect(device_viewport_size_);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
| @@ -113,7 +113,7 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
|
| factory_.Create(root_surface_id, device_viewport_size_);
|
| {
|
| gfx::Rect rect(device_viewport_size_);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
| @@ -147,7 +147,7 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
|
|
|
| {
|
| gfx::Rect rect(child_size);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
| @@ -208,7 +208,7 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
|
|
|
| {
|
| gfx::Rect rect(device_viewport_size_);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
| @@ -245,7 +245,7 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
|
|
|
| {
|
| gfx::Rect rect(child_size);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
| @@ -280,7 +280,7 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
|
|
|
| {
|
| gfx::Rect rect(child_size);
|
| - RenderPass::Id id(1, 1);
|
| + RenderPassId id(1, 1);
|
| scoped_ptr<RenderPass> pass = RenderPass::Create();
|
| pass->SetNew(id, rect, rect, gfx::Transform());
|
|
|
|
|