diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-08 16:28:09 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-08 16:28:09 -0700 |
| commit | 12fa47d33f1e9eb69bb20d9daad2eccfc7288944 (patch) | |
| tree | 3a691901d49bc1e7ce0a0200090052e9093addf4 /bench/LightingBench.cpp | |
| parent | 601e36a5c5858d1940a8c381f832e2867acbfb8e (diff) | |
Update LightingImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1869763002
Review URL: https://codereview.chromium.org/1869763002
Diffstat (limited to 'bench/LightingBench.cpp')
| -rw-r--r-- | bench/LightingBench.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index 2c78749d9f..72f37bf4d0 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -20,11 +20,11 @@ public: LightingBaseBench(bool small) : fIsSmall(small) { } protected: - void draw(int loops, SkCanvas* canvas, SkImageFilter* imageFilter) const { + void draw(int loops, SkCanvas* canvas, sk_sp<SkImageFilter> imageFilter) const { SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) : SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE); SkPaint paint; - paint.setImageFilter(imageFilter)->unref(); + paint.setImageFilter(std::move(imageFilter)); for (int i = 0; i < loops; i++) { canvas->drawRect(r, paint); } @@ -99,8 +99,7 @@ protected: class LightingPointLitDiffuseBench : public LightingBaseBench { public: - LightingPointLitDiffuseBench(bool small) : INHERITED(small) { - } + LightingPointLitDiffuseBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -108,10 +107,11 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(GetPointLocation(), - GetWhite(), - GetSurfaceScale(), - GetKd())); + draw(loops, canvas, SkLightingImageFilter::MakePointLitDiffuse(GetPointLocation(), + GetWhite(), + GetSurfaceScale(), + GetKd(), + nullptr)); } private: @@ -120,8 +120,7 @@ private: class LightingDistantLitDiffuseBench : public LightingBaseBench { public: - LightingDistantLitDiffuseBench(bool small) : INHERITED(small) { - } + LightingDistantLitDiffuseBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -129,10 +128,11 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(GetDistantDirection(), - GetWhite(), - GetSurfaceScale(), - GetKd())); + draw(loops, canvas, SkLightingImageFilter::MakeDistantLitDiffuse(GetDistantDirection(), + GetWhite(), + GetSurfaceScale(), + GetKd(), + nullptr)); } private: @@ -141,8 +141,7 @@ private: class LightingSpotLitDiffuseBench : public LightingBaseBench { public: - LightingSpotLitDiffuseBench(bool small) : INHERITED(small) { - } + LightingSpotLitDiffuseBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -150,13 +149,14 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(GetSpotLocation(), - GetSpotTarget(), - GetSpotExponent(), - GetCutoffAngle(), - GetWhite(), - GetSurfaceScale(), - GetKd())); + draw(loops, canvas, SkLightingImageFilter::MakeSpotLitDiffuse(GetSpotLocation(), + GetSpotTarget(), + GetSpotExponent(), + GetCutoffAngle(), + GetWhite(), + GetSurfaceScale(), + GetKd(), + nullptr)); } private: @@ -165,8 +165,7 @@ private: class LightingPointLitSpecularBench : public LightingBaseBench { public: - LightingPointLitSpecularBench(bool small) : INHERITED(small) { - } + LightingPointLitSpecularBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -174,11 +173,12 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(GetPointLocation(), - GetWhite(), - GetSurfaceScale(), - GetKs(), - GetShininess())); + draw(loops, canvas, SkLightingImageFilter::MakePointLitSpecular(GetPointLocation(), + GetWhite(), + GetSurfaceScale(), + GetKs(), + GetShininess(), + nullptr)); } private: @@ -187,8 +187,7 @@ private: class LightingDistantLitSpecularBench : public LightingBaseBench { public: - LightingDistantLitSpecularBench(bool small) : INHERITED(small) { - } + LightingDistantLitSpecularBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -196,11 +195,12 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(GetDistantDirection(), - GetWhite(), - GetSurfaceScale(), - GetKs(), - GetShininess())); + draw(loops, canvas, SkLightingImageFilter::MakeDistantLitSpecular(GetDistantDirection(), + GetWhite(), + GetSurfaceScale(), + GetKs(), + GetShininess(), + nullptr)); } private: @@ -209,8 +209,7 @@ private: class LightingSpotLitSpecularBench : public LightingBaseBench { public: - LightingSpotLitSpecularBench(bool small) : INHERITED(small) { - } + LightingSpotLitSpecularBench(bool small) : INHERITED(small) { } protected: const char* onGetName() override { @@ -218,14 +217,15 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { - draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(GetSpotLocation(), - GetSpotTarget(), - GetSpotExponent(), - GetCutoffAngle(), - GetWhite(), - GetSurfaceScale(), - GetKs(), - GetShininess())); + draw(loops, canvas, SkLightingImageFilter::MakeSpotLitSpecular(GetSpotLocation(), + GetSpotTarget(), + GetSpotExponent(), + GetCutoffAngle(), + GetWhite(), + GetSurfaceScale(), + GetKs(), + GetShininess(), + nullptr)); } private: |