| Index: cc/ipc/cc_param_traits_unittest.cc
|
| diff --git a/cc/ipc/cc_param_traits_unittest.cc b/cc/ipc/cc_param_traits_unittest.cc
|
| index a2858ed3b71aeb99d217ff3a4cba4a8e7910d3e8..aea26c1741860fb3ed0c97f22be46ccbf7b9d173 100644
|
| --- a/cc/ipc/cc_param_traits_unittest.cc
|
| +++ b/cc/ipc/cc_param_traits_unittest.cc
|
| @@ -302,18 +302,18 @@ TEST_F(CCParamTraitsTest, AllQuads) {
|
| child_pass_in->SetAll(child_id, arbitrary_rect2, arbitrary_rect3,
|
| arbitrary_matrix2, arbitrary_filters1,
|
| arbitrary_filters2, arbitrary_color_space,
|
| - arbitrary_bool2);
|
| + arbitrary_bool2, arbitrary_bool3, arbitrary_bool4);
|
|
|
| std::unique_ptr<RenderPass> child_pass_cmp = RenderPass::Create();
|
| child_pass_cmp->SetAll(child_id, arbitrary_rect2, arbitrary_rect3,
|
| arbitrary_matrix2, arbitrary_filters1,
|
| arbitrary_filters2, arbitrary_color_space,
|
| - arbitrary_bool2);
|
| + arbitrary_bool2, arbitrary_bool3, arbitrary_bool4);
|
|
|
| std::unique_ptr<RenderPass> pass_in = RenderPass::Create();
|
| pass_in->SetAll(root_id, arbitrary_rect1, arbitrary_rect2, arbitrary_matrix1,
|
| arbitrary_filters2, arbitrary_filters1, arbitrary_color_space,
|
| - arbitrary_bool1);
|
| + arbitrary_bool1, arbitrary_bool2, arbitrary_bool3);
|
|
|
| SharedQuadState* shared_state1_in = pass_in->CreateAndAppendSharedQuadState();
|
| shared_state1_in->SetAll(arbitrary_matrix1, arbitrary_rect1, arbitrary_rect1,
|
| @@ -323,7 +323,8 @@ TEST_F(CCParamTraitsTest, AllQuads) {
|
| std::unique_ptr<RenderPass> pass_cmp = RenderPass::Create();
|
| pass_cmp->SetAll(root_id, arbitrary_rect1, arbitrary_rect2, arbitrary_matrix1,
|
| arbitrary_filters2, arbitrary_filters1,
|
| - arbitrary_color_space, arbitrary_bool1);
|
| + arbitrary_color_space, arbitrary_bool1, arbitrary_bool2,
|
| + arbitrary_bool3);
|
|
|
| SharedQuadState* shared_state1_cmp =
|
| pass_cmp->CreateAndAppendSharedQuadState();
|
| @@ -504,7 +505,7 @@ TEST_F(CCParamTraitsTest, UnusedSharedQuadStates) {
|
| std::unique_ptr<RenderPass> pass_in = RenderPass::Create();
|
| pass_in->SetAll(1, gfx::Rect(100, 100), gfx::Rect(), gfx::Transform(),
|
| FilterOperations(), FilterOperations(),
|
| - gfx::ColorSpace::CreateSRGB(), false);
|
| + gfx::ColorSpace::CreateSRGB(), false, false, false);
|
|
|
| // The first SharedQuadState is used.
|
| SharedQuadState* shared_state1_in = pass_in->CreateAndAppendSharedQuadState();
|
|
|