| Index: content/common/cc_messages_unittest.cc
|
| diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc
|
| index 6ba87ad69ae9af0e874ab05209292b62dd205d2f..ab02e8f57391ab4456d556bae5ab5e32b01abfd5 100644
|
| --- a/content/common/cc_messages_unittest.cc
|
| +++ b/content/common/cc_messages_unittest.cc
|
| @@ -55,6 +55,7 @@ class CCMessagesTest : public testing::Test {
|
| EXPECT_EQ(a->clip_rect, b->clip_rect);
|
| EXPECT_EQ(a->is_clipped, b->is_clipped);
|
| EXPECT_EQ(a->opacity, b->opacity);
|
| + EXPECT_EQ(a->blend_mode, b->blend_mode);
|
| }
|
|
|
| void Compare(const DrawQuad* a, const DrawQuad* b) {
|
| @@ -234,6 +235,9 @@ TEST_F(CCMessagesTest, AllQuads) {
|
| bool arbitrary_bool3 = true;
|
| int arbitrary_int = 5;
|
| SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58);
|
| + SkXfermode::Mode arbitrary_blend_mode1 = SkXfermode::kScreen_Mode;
|
| + SkXfermode::Mode arbitrary_blend_mode2 = SkXfermode::kLighten_Mode;
|
| + SkXfermode::Mode arbitrary_blend_mode3 = SkXfermode::kOverlay_Mode;
|
| IOSurfaceDrawQuad::Orientation arbitrary_orientation =
|
| IOSurfaceDrawQuad::UNFLIPPED;
|
| RenderPass::Id arbitrary_id(10, 14);
|
| @@ -261,7 +265,8 @@ TEST_F(CCMessagesTest, AllQuads) {
|
| arbitrary_rect1,
|
| arbitrary_rect2,
|
| arbitrary_bool1,
|
| - arbitrary_float1);
|
| + arbitrary_float1,
|
| + arbitrary_blend_mode1);
|
| scoped_ptr<SharedQuadState> shared_state1_cmp = shared_state1_in->Copy();
|
|
|
| scoped_ptr<CheckerboardDrawQuad> checkerboard_in =
|
| @@ -323,7 +328,8 @@ TEST_F(CCMessagesTest, AllQuads) {
|
| arbitrary_rect2,
|
| arbitrary_rect3,
|
| arbitrary_bool1,
|
| - arbitrary_float2);
|
| + arbitrary_float2,
|
| + arbitrary_blend_mode2);
|
| scoped_ptr<SharedQuadState> shared_state2_cmp = shared_state2_in->Copy();
|
|
|
| scoped_ptr<SharedQuadState> shared_state3_in = SharedQuadState::Create();
|
| @@ -332,7 +338,8 @@ TEST_F(CCMessagesTest, AllQuads) {
|
| arbitrary_rect3,
|
| arbitrary_rect1,
|
| arbitrary_bool1,
|
| - arbitrary_float3);
|
| + arbitrary_float3,
|
| + arbitrary_blend_mode3);
|
| scoped_ptr<SharedQuadState> shared_state3_cmp = shared_state3_in->Copy();
|
|
|
| scoped_ptr<SolidColorDrawQuad> solidcolor_in =
|
|
|