Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #1 id:1 of https://codereview.chromium.org/1821103004/ )
Reason for revert:
guard has now landed in chrome
Original issue's description:
> Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
>
> Reason for revert:
> CreateModeFilter not compiling
>
> Original issue's description:
> > Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
> >
> > Fixed legacy withColorFilter to call new(er) make method
> >
> > This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
> >
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
>
> TBR=
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d6889293dd0942f27f9593f679722c956831f2c4
TBR=
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review URL: https://codereview.chromium.org/1827433002
diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp
index bd3f80f..cafcd38 100644
--- a/bench/ImageFilterCollapse.cpp
+++ b/bench/ImageFilterCollapse.cpp
@@ -28,12 +28,12 @@
}
protected:
- void doPreDraw(SkColorFilter* colorFilters[], int nFilters) {
+ void doPreDraw(sk_sp<SkColorFilter> colorFilters[], int nFilters) {
// Create a chain of ImageFilters from colorFilters
fImageFilter = nullptr;
for(int i = nFilters; i --> 0;) {
SkAutoTUnref<SkImageFilter> filter(
- SkColorFilterImageFilter::Create(colorFilters[i], fImageFilter, nullptr)
+ SkColorFilterImageFilter::Create(colorFilters[i].get(), fImageFilter, nullptr)
);
SkRefCnt_SafeAssign(fImageFilter, filter.get());
}
@@ -73,15 +73,12 @@
};
class TableCollapseBench: public BaseImageFilterCollapseBench {
-public:
- virtual ~TableCollapseBench() {}
-
protected:
- virtual const char* onGetName() override {
+ const char* onGetName() override {
return "image_filter_collapse_table";
}
- virtual void onDelayedSetup() override {
+ void onDelayedSetup() override {
for (int i = 0; i < 256; ++i) {
int n = i >> 5;
table1[i] = (n << 5) | (n << 2) | (n >> 1);
@@ -92,63 +89,52 @@
table3[i] = static_cast<uint8_t>(sqrtf(fi) * 255);
}
- SkColorFilter* colorFilters[] = {
- SkTableColorFilter::Create(table1),
- SkTableColorFilter::Create(table2),
- SkTableColorFilter::Create(table3),
+ sk_sp<SkColorFilter> colorFilters[] = {
+ SkTableColorFilter::Make(table1),
+ SkTableColorFilter::Make(table2),
+ SkTableColorFilter::Make(table3),
};
doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters));
-
- for(unsigned i = 0; i < SK_ARRAY_COUNT(colorFilters); i++) {
- colorFilters[i]->unref();
- }
}
private:
uint8_t table1[256], table2[256], table3[256];
};
-static SkColorFilter* make_brightness(float amount) {
+static sk_sp<SkColorFilter> make_brightness(float amount) {
SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
0, 1, 0, 0, amount255,
0, 0, 1, 0, amount255,
0, 0, 0, 1, 0 };
- return SkColorMatrixFilter::Create(matrix);
+ return SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
}
-static SkColorFilter* make_grayscale() {
+static sk_sp<SkColorFilter> make_grayscale() {
SkScalar matrix[20];
memset(matrix, 0, 20 * sizeof(SkScalar));
matrix[0] = matrix[5] = matrix[10] = 0.2126f;
matrix[1] = matrix[6] = matrix[11] = 0.7152f;
matrix[2] = matrix[7] = matrix[12] = 0.0722f;
matrix[18] = 1.0f;
- return SkColorMatrixFilter::Create(matrix);
+ return SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
}
class MatrixCollapseBench: public BaseImageFilterCollapseBench {
-public:
- virtual ~MatrixCollapseBench() {}
-
protected:
- virtual const char* onGetName() override {
+ const char* onGetName() override {
return "image_filter_collapse_matrix";
}
- virtual void onDelayedSetup() override {
- SkColorFilter* colorFilters[] = {
+ void onDelayedSetup() override {
+ sk_sp<SkColorFilter> colorFilters[] = {
make_brightness(0.1f),
make_grayscale(),
make_brightness(-0.1f),
};
doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters));
-
- for(unsigned i = 0; i < SK_ARRAY_COUNT(colorFilters); i++) {
- colorFilters[i]->unref();
- }
}
};