| Index: cc/delegated_renderer_layer_impl_unittest.cc
|
| diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
|
| index b9c9b9228dfaf62783659092bb949782afcde2f0..0a827e612f020b10c591de3a0677905cfc0b3b3b 100644
|
| --- a/cc/delegated_renderer_layer_impl_unittest.cc
|
| +++ b/cc/delegated_renderer_layer_impl_unittest.cc
|
| @@ -90,7 +90,7 @@ public:
|
| addRenderPassQuad(pass2, pass1);
|
| TestRenderPass* pass3 = addRenderPass(delegatedRenderPasses, RenderPass::Id(9, 8), gfx::Rect(8, 8, 8, 8), gfx::Transform());
|
| addRenderPassQuad(pass3, pass2);
|
| - delegatedRendererLayer->setRenderPasses(delegatedRenderPasses);
|
| + delegatedRendererLayer->setRenderPasses(delegatedRenderPasses, gfx::Size(10, 10));
|
|
|
| // The RenderPasses should be taken by the layer.
|
| EXPECT_EQ(0u, delegatedRenderPasses.size());
|
| @@ -418,7 +418,8 @@ public:
|
| colorQuad->SetNew(sharedState, gfx::Rect(10, 10, 10, 10), 4u);
|
| quadSink.append(colorQuad.PassAs<DrawQuad>(), data);
|
|
|
| - delegatedRendererLayer->setRenderPasses(delegatedRenderPasses);
|
| + delegatedRendererLayer->setRenderPasses(
|
| + delegatedRenderPasses, gfx::Size(20, 20));
|
|
|
| // The RenderPasses should be taken by the layer.
|
| EXPECT_EQ(0u, delegatedRenderPasses.size());
|
| @@ -460,10 +461,14 @@ TEST_F(DelegatedRendererLayerImplTestSharedData, SharedData)
|
| EXPECT_RECT_EQ(gfx::Rect(21, 21, 100, 100), sharedState->clipped_rect_in_target);
|
| EXPECT_RECT_EQ(gfx::Rect(21, 21, 100, 100), sharedState->clip_rect);
|
| gfx::Transform expected;
|
| + // This is the transform from the layer's space to its target.
|
| // The position (20) - the width / scale (30 / 2) = 20 - 15 = 5
|
| expected.Translate(5.0, 5.0);
|
| expected.Scale(2.0, 2.0);
|
| expected.Translate(8.0, 8.0);
|
| + // The frame has size 20x20 but the layer's bounds are 30x30.
|
| + expected.Scale(20.0 / 30.0, 20.0 / 30.0);
|
| + // This is the transform within the source frame.
|
| expected.Scale(1.5, 1.5);
|
| expected.Translate(7.0, 7.0);
|
| EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->content_to_target_transform);
|
|
|