diff options
author | reed <reed@google.com> | 2016-03-14 11:53:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 11:53:07 -0700 |
commit | 106e10ddff5d473dc81dd1ce8ade615585ea609b (patch) | |
tree | 4cdbff97b6e2bf856dff2875ff2c8a818f9b27ea /bench/AlternatingColorPatternBench.cpp | |
parent | 15c3a0e55bd9134dace0ace2fffb855a0f09542f (diff) |
Revert of Finish conversion to sk_sp<SkShader> (patchset #2 id:20001 of https://codereview.chromium.org/1803763002/ )
Reason for revert:
need to update cmake build example
Original issue's description:
> Finish conversion to sk_sp<SkShader>
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1803763002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/15c3a0e55bd9134dace0ace2fffb855a0f09542f
TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1798133003
Diffstat (limited to 'bench/AlternatingColorPatternBench.cpp')
-rw-r--r-- | bench/AlternatingColorPatternBench.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp index 147dc3607b..b7285d6e3b 100644 --- a/bench/AlternatingColorPatternBench.cpp +++ b/bench/AlternatingColorPatternBench.cpp @@ -51,11 +51,11 @@ static void makebm(SkBitmap* bm, int w, int h) { SkPaint paint; - paint.setShader(SkGradientShader::MakeLinear(kPts0, kColors0, kPos, SK_ARRAY_COUNT(kColors0), - SkShader::kClamp_TileMode)); + paint.setShader(SkGradientShader::CreateLinear(kPts0, kColors0, kPos, + SK_ARRAY_COUNT(kColors0), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); - paint.setShader(SkGradientShader::MakeLinear(kPts1, kColors1, kPos, SK_ARRAY_COUNT(kColors1), - SkShader::kClamp_TileMode)); + paint.setShader(SkGradientShader::CreateLinear(kPts1, kColors1, kPos, + SK_ARRAY_COUNT(kColors1), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); } @@ -80,12 +80,12 @@ public: NY = 5, NUM_DRAWS = NX * NY, }; - sk_sp<SkShader> fBmShader; + SkShader* fBmShader; SkPath fPaths[NUM_DRAWS]; SkRect fRects[NUM_DRAWS]; SkColor fColors[NUM_DRAWS]; - sk_sp<SkShader> fShaders[NUM_DRAWS]; + SkShader* fShaders[NUM_DRAWS]; SkString fName; ColorPatternData fPattern1; @@ -94,7 +94,8 @@ public: SkBitmap fBmp; - AlternatingColorPatternBench(ColorPattern pattern1, ColorPattern pattern2, DrawType drawType) { + AlternatingColorPatternBench(ColorPattern pattern1, ColorPattern pattern2, DrawType drawType) + : fBmShader(nullptr) { fPattern1 = gColorPatterns[pattern1]; fPattern2 = gColorPatterns[pattern2]; fName.printf("colorPattern_%s_%s_%s", @@ -103,6 +104,10 @@ public: fDrawType = drawType; } + virtual ~AlternatingColorPatternBench() { + SkSafeUnref(fBmShader); + } + protected: const char* onGetName() override { return fName.c_str(); @@ -112,7 +117,7 @@ protected: int w = 40; int h = 40; makebm(&fBmp, w, h); - fBmShader = SkShader::MakeBitmapShader(fBmp, + fBmShader = SkShader::CreateBitmapShader(fBmp, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); int offset = 2; |