Chromium Code Reviews| Index: cc/output/filter_operation.cc |
| diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc |
| index 37ff8711c2b6a2c628747d5defb18395f4d6301f..ce20ec5017fb1b498b7d22eebcf08399f737e9bd 100644 |
| --- a/cc/output/filter_operation.cc |
| +++ b/cc/output/filter_operation.cc |
| @@ -86,9 +86,8 @@ FilterOperation::FilterOperation(FilterType type, float amount, int inset) |
| memset(matrix_, 0, sizeof(matrix_)); |
| } |
| -FilterOperation::FilterOperation( |
| - FilterType type, |
| - const skia::RefPtr<SkImageFilter>& image_filter) |
| +FilterOperation::FilterOperation(FilterType type, |
| + const sk_sp<SkImageFilter>& image_filter) |
|
danakj
2016/04/14 19:37:31
ditto
tomhudson
2016/04/25 20:48:10
Done.
|
| : type_(type), |
| amount_(0), |
| outer_threshold_(0), |
| @@ -164,8 +163,7 @@ static FilterOperation CreateNoOpFilter(FilterOperation::FilterType type) { |
| case FilterOperation::SATURATING_BRIGHTNESS: |
| return FilterOperation::CreateSaturatingBrightnessFilter(0.f); |
| case FilterOperation::REFERENCE: |
| - return FilterOperation::CreateReferenceFilter( |
| - skia::RefPtr<SkImageFilter>()); |
| + return FilterOperation::CreateReferenceFilter(sk_sp<SkImageFilter>()); |
|
danakj
2016/04/14 19:37:31
nullptr
tomhudson
2016/04/25 20:48:10
Done.
|
| case FilterOperation::ALPHA_THRESHOLD: |
| return FilterOperation::CreateAlphaThresholdFilter(SkRegion(), 1.f, 0.f); |
| } |