From 7bbeaf4e5b9ad540bf6d3496470778ed74737766 Mon Sep 17 00:00:00 2001 From: "rosca@adobe.com" Date: Tue, 26 Nov 2013 10:27:22 +0000 Subject: The blink part of this implementation is uploaded at https://codereview.chromium.org/23511004/ The spec for mix-blend-mode is http://dev.w3.org/fxtf/compositing-1/#mix-blend-mode BUG=243223 Review URL: https://codereview.chromium.org/23455060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237295 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/quads/render_pass_unittest.cc | 72 +++++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 16 deletions(-) (limited to 'cc/quads/render_pass_unittest.cc') diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc index 394a3ec..e70a33dd 100644 --- a/cc/quads/render_pass_unittest.cc +++ b/cc/quads/render_pass_unittest.cc @@ -80,8 +80,13 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) { // Stick a quad in the pass, this should not get copied. scoped_ptr shared_state = SharedQuadState::Create(); - shared_state->SetAll( - gfx::Transform(), gfx::Size(), gfx::Rect(), gfx::Rect(), false, 1); + shared_state->SetAll(gfx::Transform(), + gfx::Size(), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state.Pass()); scoped_ptr checkerboard_quad = @@ -126,8 +131,13 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) { // Two quads using one shared state. scoped_ptr shared_state1 = SharedQuadState::Create(); - shared_state1->SetAll( - gfx::Transform(), gfx::Size(1, 1), gfx::Rect(), gfx::Rect(), false, 1); + shared_state1->SetAll(gfx::Transform(), + gfx::Size(1, 1), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state1.Pass()); scoped_ptr checkerboard_quad1 = @@ -144,8 +154,13 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) { // And two quads using another shared state. scoped_ptr shared_state2 = SharedQuadState::Create(); - shared_state2->SetAll( - gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), gfx::Rect(), false, 1); + shared_state2->SetAll(gfx::Transform(), + gfx::Size(2, 2), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state2.Pass()); scoped_ptr checkerboard_quad3 = @@ -176,8 +191,13 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) { contrib_has_transparent_background); scoped_ptr contrib_shared_state = SharedQuadState::Create(); - contrib_shared_state->SetAll( - gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), gfx::Rect(), false, 1); + contrib_shared_state->SetAll(gfx::Transform(), + gfx::Size(2, 2), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); contrib->AppendSharedQuadState(contrib_shared_state.Pass()); scoped_ptr contrib_quad = @@ -228,8 +248,13 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) { // A shared state with a quad. scoped_ptr shared_state1 = SharedQuadState::Create(); - shared_state1->SetAll( - gfx::Transform(), gfx::Size(1, 1), gfx::Rect(), gfx::Rect(), false, 1); + shared_state1->SetAll(gfx::Transform(), + gfx::Size(1, 1), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state1.Pass()); scoped_ptr checkerboard_quad1 = @@ -240,20 +265,35 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) { // A shared state with no quads, they were culled. scoped_ptr shared_state2 = SharedQuadState::Create(); - shared_state2->SetAll( - gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), gfx::Rect(), false, 1); + shared_state2->SetAll(gfx::Transform(), + gfx::Size(2, 2), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state2.Pass()); // A second shared state with no quads. scoped_ptr shared_state3 = SharedQuadState::Create(); - shared_state3->SetAll( - gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), gfx::Rect(), false, 1); + shared_state3->SetAll(gfx::Transform(), + gfx::Size(2, 2), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state3.Pass()); // A last shared state with a quad again. scoped_ptr shared_state4 = SharedQuadState::Create(); - shared_state4->SetAll( - gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), gfx::Rect(), false, 1); + shared_state4->SetAll(gfx::Transform(), + gfx::Size(2, 2), + gfx::Rect(), + gfx::Rect(), + false, + 1, + SkXfermode::kSrcOver_Mode); pass->AppendSharedQuadState(shared_state4.Pass()); scoped_ptr checkerboard_quad2 = -- cgit v1.1