| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index c12bbfe3c0e93e331984dde7f644635e3aecc82a..6dc4c0c7d41f25f9a29a829262380cf39fa92e4a 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -1209,6 +1209,8 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| skia::AdoptRef(new SkColorMatrixFilter(matrix)));
|
| skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
|
| SkColorFilterImageFilter::Create(color_filter.get(), NULL));
|
| + FilterOperations filters;
|
| + filters.Append(FilterOperation::CreateReferenceFilter(filter));
|
|
|
| gfx::Transform transform_causing_aa;
|
| transform_causing_aa.Rotate(20.0);
|
| @@ -1225,7 +1227,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1242,7 +1244,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| root_pass = AddRenderPass(
|
| render_passes, root_pass_id, viewport_rect, gfx::Transform());
|
|
|
| - AddRenderPassQuad(root_pass, child_pass, 0, filter, gfx::Transform());
|
| + AddRenderPassQuad(root_pass, child_pass, 0, filters, gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| *renderer_client_.render_passes_in_draw_order());
|
| @@ -1261,7 +1263,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| mask,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1278,7 +1280,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| root_pass = AddRenderPass(
|
| render_passes, root_pass_id, viewport_rect, gfx::Transform());
|
|
|
| - AddRenderPassQuad(root_pass, child_pass, mask, filter, gfx::Transform());
|
| + AddRenderPassQuad(root_pass, child_pass, mask, filters, gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| *renderer_client_.render_passes_in_draw_order());
|
| @@ -1297,7 +1299,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| transform_causing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1314,7 +1316,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| root_pass = AddRenderPass(
|
| render_passes, root_pass_id, viewport_rect, gfx::Transform());
|
|
|
| - AddRenderPassQuad(root_pass, child_pass, 0, filter, transform_causing_aa);
|
| + AddRenderPassQuad(root_pass, child_pass, 0, filters, transform_causing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| *renderer_client_.render_passes_in_draw_order());
|
| @@ -1330,7 +1332,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| root_pass = AddRenderPass(render_passes, root_pass_id, viewport_rect,
|
| gfx::Transform());
|
|
|
| - AddRenderPassQuad(root_pass, child_pass, mask, skia::RefPtr<SkImageFilter>(),
|
| + AddRenderPassQuad(root_pass, child_pass, mask, FilterOperations(),
|
| transform_causing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1347,7 +1349,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| root_pass = AddRenderPass(render_passes, root_pass_id, viewport_rect,
|
| transform_causing_aa);
|
|
|
| - AddRenderPassQuad(root_pass, child_pass, mask, filter, transform_causing_aa);
|
| + AddRenderPassQuad(root_pass, child_pass, mask, filters, transform_causing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| *renderer_client_.render_passes_in_draw_order());
|
| @@ -1394,7 +1396,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadSkipsAAForClippingTransform) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| transform_preventing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
|
|