aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/ColorFilterBench.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-22 07:23:24 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-22 07:23:24 -0700
commitf809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch)
tree38fa4182df2c735459e43b0eaaa073c1ef8c612d /bench/ColorFilterBench.cpp
parentcfcd1819d1431bbe5812c174fc337d3678d63f06 (diff)
switch colorfilters to sk_sp
Diffstat (limited to 'bench/ColorFilterBench.cpp')
-rw-r--r--bench/ColorFilterBench.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index 5365a9c2ad..c4ba1e5dcb 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -34,8 +34,8 @@ protected:
0, 1, 0, 0, amount255,
0, 0, 1, 0, amount255,
0, 0, 0, 1, 0 };
- SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
- return SkColorFilterImageFilter::Create(filter, input);
+ auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+ return SkColorFilterImageFilter::Create(filter.get(), input);
}
static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) {
@@ -45,14 +45,13 @@ protected:
matrix[1] = matrix[6] = matrix[11] = 0.7152f;
matrix[2] = matrix[7] = matrix[12] = 0.0722f;
matrix[18] = 1.0f;
- SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
- return SkColorFilterImageFilter::Create(filter, input);
+ auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+ return SkColorFilterImageFilter::Create(filter.get(), input);
}
static SkImageFilter* make_mode_blue(SkImageFilter* input = nullptr) {
- SkAutoTUnref<SkColorFilter> filter(
- SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
- return SkColorFilterImageFilter::Create(filter, input);
+ auto filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
+ return SkColorFilterImageFilter::Create(filter.get(), input);
}
inline bool isSmall() const { return fIsSmall; }