diff options
author | reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /bench/ImageFilterCollapse.cpp | |
parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1820303002
Diffstat (limited to 'bench/ImageFilterCollapse.cpp')
-rw-r--r-- | bench/ImageFilterCollapse.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp index cafcd38c6e..bd3f80fefb 100644 --- a/bench/ImageFilterCollapse.cpp +++ b/bench/ImageFilterCollapse.cpp @@ -28,12 +28,12 @@ public: } protected: - void doPreDraw(sk_sp<SkColorFilter> colorFilters[], int nFilters) { + void doPreDraw(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].get(), fImageFilter, nullptr) + SkColorFilterImageFilter::Create(colorFilters[i], fImageFilter, nullptr) ); SkRefCnt_SafeAssign(fImageFilter, filter.get()); } @@ -73,12 +73,15 @@ private: }; class TableCollapseBench: public BaseImageFilterCollapseBench { +public: + virtual ~TableCollapseBench() {} + protected: - const char* onGetName() override { + virtual const char* onGetName() override { return "image_filter_collapse_table"; } - void onDelayedSetup() override { + virtual void onDelayedSetup() override { for (int i = 0; i < 256; ++i) { int n = i >> 5; table1[i] = (n << 5) | (n << 2) | (n >> 1); @@ -89,52 +92,63 @@ protected: table3[i] = static_cast<uint8_t>(sqrtf(fi) * 255); } - sk_sp<SkColorFilter> colorFilters[] = { - SkTableColorFilter::Make(table1), - SkTableColorFilter::Make(table2), - SkTableColorFilter::Make(table3), + SkColorFilter* colorFilters[] = { + SkTableColorFilter::Create(table1), + SkTableColorFilter::Create(table2), + SkTableColorFilter::Create(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 sk_sp<SkColorFilter> make_brightness(float amount) { +static 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 SkColorFilter::MakeMatrixFilterRowMajor255(matrix); + return SkColorMatrixFilter::Create(matrix); } -static sk_sp<SkColorFilter> make_grayscale() { +static 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 SkColorFilter::MakeMatrixFilterRowMajor255(matrix); + return SkColorMatrixFilter::Create(matrix); } class MatrixCollapseBench: public BaseImageFilterCollapseBench { +public: + virtual ~MatrixCollapseBench() {} + protected: - const char* onGetName() override { + virtual const char* onGetName() override { return "image_filter_collapse_matrix"; } - void onDelayedSetup() override { - sk_sp<SkColorFilter> colorFilters[] = { + virtual void onDelayedSetup() override { + 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(); + } } }; |