| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index e2a825ae10c5854f2d7aea05761c24e5ec63d800..78184d956f63811a19401e4ca3424170731fe290 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -1232,6 +1232,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);
|
| @@ -1248,7 +1250,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1266,7 +1268,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());
|
| @@ -1286,7 +1288,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| mask,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| gfx::Transform());
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1304,7 +1306,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());
|
| @@ -1324,7 +1326,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| transform_causing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
| @@ -1342,7 +1344,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());
|
| @@ -1359,7 +1361,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(
|
| @@ -1377,7 +1379,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());
|
| @@ -1425,7 +1427,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadSkipsAAForClippingTransform) {
|
| AddRenderPassQuad(root_pass,
|
| child_pass,
|
| 0,
|
| - skia::RefPtr<SkImageFilter>(),
|
| + FilterOperations(),
|
| transform_preventing_aa);
|
|
|
| renderer_->DecideRenderPassAllocationsForFrame(
|
|
|