Chromium Code Reviews| 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 db7e70c2e405e99c2cbcedb779acccec2c6514da..b9a5c2938327ff938b73cc242aa7ca63c3b3376f 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))); |
|
danakj
2016/04/25 22:06:23
nit: nullptr
tomhudson
2016/04/27 12:06:47
Done.
|
| // 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); |