| Index: cc/trees/layer_tree_host_pixeltest_filters.cc
|
| diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
|
| index 34592e052a5ded7828bfd10d8301c993ef207625..116eacca1f388f50f92b2bca46a675b79ae08060 100644
|
| --- a/cc/trees/layer_tree_host_pixeltest_filters.cc
|
| +++ b/cc/trees/layer_tree_host_pixeltest_filters.cc
|
| @@ -248,10 +248,9 @@ class ImageFilterClippedPixelTest : public LayerTreeHostFiltersPixelTest {
|
| SkImageFilter::CropRect crop_rect(SkRect::MakeXYWH(0, 100, 200, 100));
|
| sk_sp<SkColorFilter> color_filter =
|
| SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
|
| - skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
|
| - SkColorFilterImageFilter::Create(color_filter.get(), NULL, &crop_rect));
|
| FilterOperations filters;
|
| - filters.Append(FilterOperation::CreateReferenceFilter(filter));
|
| + filters.Append(FilterOperation::CreateReferenceFilter(
|
| + SkColorFilterImageFilter::Make(color_filter, NULL, &crop_rect)));
|
|
|
| // Make the foreground layer's render surface be clipped by the background
|
| // layer.
|
| @@ -561,9 +560,8 @@ class EnlargedTextureWithCropOffsetFilter
|
|
|
| FilterOperations filters;
|
| SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(10, 10, 80, 80));
|
| - skia::RefPtr<SkImageFilter> filter(
|
| - skia::AdoptRef(SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect)));
|
| - filters.Append(FilterOperation::CreateReferenceFilter(filter));
|
| + filters.Append(FilterOperation::CreateReferenceFilter(
|
| + SkOffsetImageFilter::Make(0, 0, nullptr, &cropRect)));
|
| filter_layer->SetFilters(filters);
|
|
|
| background->AddChild(filter_layer);
|
| @@ -607,12 +605,10 @@ class FilterWithGiantCropRectPixelTest : public LayerTreeHostFiltersPixelTest {
|
| FilterOperations filters;
|
| SkImageFilter::CropRect cropRect(
|
| SkRect::MakeXYWH(-40000, -40000, 80000, 80000));
|
| - sk_sp<SkColorFilter> color_filter =
|
| - SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
|
| - skia::RefPtr<SkImageFilter> filter(
|
| - skia::AdoptRef(SkColorFilterImageFilter::Create(color_filter.get(),
|
| - nullptr, &cropRect)));
|
| - filters.Append(FilterOperation::CreateReferenceFilter(filter));
|
| + filters.Append(
|
| + FilterOperation::CreateReferenceFilter((SkColorFilterImageFilter::Make(
|
| + SkColorFilter::MakeMatrixFilterRowMajor255(matrix), nullptr,
|
| + &cropRect))));
|
| filter_layer->SetFilters(filters);
|
| background->SetMasksToBounds(masks_to_bounds);
|
| background->AddChild(filter_layer);
|
|
|