| Index: cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| index 58fa36692e68674f6ac0fbd5c277b78a7285f204..2d2575f471ccda4c061bd70aadfebcd0f076bc8d 100644
|
| --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
|
| @@ -495,13 +495,13 @@ class DelegatedRendererLayerImplTestTransform
|
| AppendQuadsData data(pass->id);
|
| SharedQuadState* shared_quad_state = quad_sink.UseSharedQuadState(
|
| SharedQuadState::Create());
|
| - shared_quad_state->SetAll(
|
| - child_pass_transform,
|
| - child_pass_content_bounds,
|
| - child_pass_rect,
|
| - child_pass_clip_rect,
|
| - child_pass_clipped,
|
| - 1.f);
|
| + shared_quad_state->SetAll(child_pass_transform,
|
| + child_pass_content_bounds,
|
| + child_pass_rect,
|
| + child_pass_clip_rect,
|
| + child_pass_clipped,
|
| + 1.f,
|
| + SkXfermode::kSrcOver_Mode);
|
|
|
| scoped_ptr<SolidColorDrawQuad> color_quad;
|
| color_quad = SolidColorDrawQuad::Create();
|
| @@ -530,13 +530,13 @@ class DelegatedRendererLayerImplTestTransform
|
| AppendQuadsData data(pass->id);
|
| SharedQuadState* shared_quad_state =
|
| quad_sink.UseSharedQuadState(SharedQuadState::Create());
|
| - shared_quad_state->SetAll(
|
| - root_pass_transform,
|
| - root_pass_content_bounds,
|
| - root_pass_rect,
|
| - root_pass_clip_rect,
|
| - root_pass_clipped,
|
| - 1.f);
|
| + shared_quad_state->SetAll(root_pass_transform,
|
| + root_pass_content_bounds,
|
| + root_pass_rect,
|
| + root_pass_clip_rect,
|
| + root_pass_clipped,
|
| + 1.f,
|
| + SkXfermode::kSrcOver_Mode);
|
|
|
| scoped_ptr<RenderPassDrawQuad> render_pass_quad =
|
| RenderPassDrawQuad::Create();
|
| @@ -899,13 +899,13 @@ class DelegatedRendererLayerImplTestClip
|
| AppendQuadsData data(pass->id);
|
| SharedQuadState* shared_quad_state =
|
| quad_sink.UseSharedQuadState(SharedQuadState::Create());
|
| - shared_quad_state->SetAll(
|
| - child_pass_transform,
|
| - child_pass_content_bounds,
|
| - child_pass_rect,
|
| - child_pass_clip_rect,
|
| - child_pass_clipped,
|
| - 1.f);
|
| + shared_quad_state->SetAll(child_pass_transform,
|
| + child_pass_content_bounds,
|
| + child_pass_rect,
|
| + child_pass_clip_rect,
|
| + child_pass_clipped,
|
| + 1.f,
|
| + SkXfermode::kSrcOver_Mode);
|
|
|
| scoped_ptr<SolidColorDrawQuad> color_quad;
|
| color_quad = SolidColorDrawQuad::Create();
|
| @@ -937,7 +937,8 @@ class DelegatedRendererLayerImplTestClip
|
| root_pass_rect,
|
| root_pass_clip_rect,
|
| root_pass_clipped,
|
| - 1.f);
|
| + 1.f,
|
| + SkXfermode::kSrcOver_Mode);
|
|
|
| scoped_ptr<RenderPassDrawQuad> render_pass_quad =
|
| RenderPassDrawQuad::Create();
|
|
|