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..4c8e7e82c3ab10e734b241aab69b95c94e43d37a 100644 |
--- a/cc/trees/layer_tree_host_pixeltest_filters.cc |
+++ b/cc/trees/layer_tree_host_pixeltest_filters.cc |
@@ -248,7 +248,7 @@ 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( |
+ sk_sp<SkImageFilter> filter( |
SkColorFilterImageFilter::Create(color_filter.get(), NULL, &crop_rect)); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
danakj
2016/04/14 19:37:33
move filter
tomhudson
2016/04/25 20:48:15
inlined
|
@@ -561,8 +561,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))); |
+ sk_sp<SkImageFilter> filter = |
+ SkOffsetImageFilter::Make(0, 0, nullptr, &cropRect); |
filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
danakj
2016/04/14 19:37:33
move filter
tomhudson
2016/04/25 20:48:16
inlined
|
filter_layer->SetFilters(filters); |
@@ -609,9 +609,8 @@ class FilterWithGiantCropRectPixelTest : public LayerTreeHostFiltersPixelTest { |
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))); |
+ sk_sp<SkImageFilter> filter(SkColorFilterImageFilter::Create( |
+ color_filter.get(), nullptr, &cropRect)); |
filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
danakj
2016/04/14 19:37:33
move filter
tomhudson
2016/04/25 20:48:16
inlined
|
filter_layer->SetFilters(filters); |
background->SetMasksToBounds(masks_to_bounds); |