diff options
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/data/blending_and_filter.png | bin | 0 -> 909 bytes | |||
| -rw-r--r-- | cc/test/data/blending_transparent.png | bin | 0 -> 919 bytes | |||
| -rw-r--r-- | cc/test/data/blending_with_root.png | bin | 0 -> 889 bytes | |||
| -rw-r--r-- | cc/test/render_pass_test_common.cc | 11 | ||||
| -rw-r--r-- | cc/test/render_pass_test_utils.cc | 37 |
5 files changed, 39 insertions, 9 deletions
diff --git a/cc/test/data/blending_and_filter.png b/cc/test/data/blending_and_filter.png Binary files differnew file mode 100644 index 0000000..07e7fea --- /dev/null +++ b/cc/test/data/blending_and_filter.png diff --git a/cc/test/data/blending_transparent.png b/cc/test/data/blending_transparent.png Binary files differnew file mode 100644 index 0000000..dc20808 --- /dev/null +++ b/cc/test/data/blending_transparent.png diff --git a/cc/test/data/blending_with_root.png b/cc/test/data/blending_with_root.png Binary files differnew file mode 100644 index 0000000..519c642 --- /dev/null +++ b/cc/test/data/blending_with_root.png diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc index 35bc561..4b69a7e 100644 --- a/cc/test/render_pass_test_common.cc +++ b/cc/test/render_pass_test_common.cc @@ -90,7 +90,8 @@ void TestRenderPass::AppendOneOfEveryQuadType( rect, rect, false, - 1); + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<cc::CheckerboardDrawQuad> checkerboard_quad = cc::CheckerboardDrawQuad::Create(); @@ -204,7 +205,13 @@ void TestRenderPass::AppendOneOfEveryQuadType( AppendQuad(transformed_tile_quad.PassAs<DrawQuad>()); scoped_ptr<cc::SharedQuadState> shared_state2 = cc::SharedQuadState::Create(); - shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1); + shared_state->SetAll(gfx::Transform(), + rect.size(), + rect, + rect, + false, + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<cc::TileDrawQuad> tile_quad = cc::TileDrawQuad::Create(); tile_quad->SetNew(shared_state2.get(), diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index b2045d7..32e6f48 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc @@ -36,7 +36,13 @@ SolidColorDrawQuad* AddQuad(TestRenderPass* pass, AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); - shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1); + shared_state->SetAll(gfx::Transform(), + rect.size(), + rect, + rect, + false, + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); @@ -51,7 +57,13 @@ SolidColorDrawQuad* AddClippedQuad(TestRenderPass* pass, AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); - shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, true, 1); + shared_state->SetAll(gfx::Transform(), + rect.size(), + rect, + rect, + true, + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); @@ -67,7 +79,8 @@ SolidColorDrawQuad* AddTransformedQuad(TestRenderPass* pass, AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); - shared_state->SetAll(transform, rect.size(), rect, rect, false, 1); + shared_state->SetAll( + transform, rect.size(), rect, rect, false, 1, SkXfermode::kSrcOver_Mode); scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); @@ -83,8 +96,13 @@ void AddRenderPassQuad(TestRenderPass* to_pass, gfx::Rect output_rect = contributing_pass->output_rect; SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); - shared_state->SetAll( - gfx::Transform(), output_rect.size(), output_rect, output_rect, false, 1); + shared_state->SetAll(gfx::Transform(), + output_rect.size(), + output_rect, + output_rect, + false, + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); quad->SetNew(shared_state, output_rect, contributing_pass->id, false, 0, output_rect, gfx::RectF(), FilterOperations(), @@ -103,8 +121,13 @@ void AddRenderPassQuad(TestRenderPass* to_pass, gfx::Rect output_rect = contributing_pass->output_rect; SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); - shared_state->SetAll( - transform, output_rect.size(), output_rect, output_rect, false, 1); + shared_state->SetAll(transform, + output_rect.size(), + output_rect, + output_rect, + false, + 1, + SkXfermode::kSrcOver_Mode); scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); quad->SetNew(shared_state, output_rect, contributing_pass->id, false, mask_resource_id, output_rect, gfx::RectF(), filters, |
