diff options
author | 2016-03-22 07:23:24 -0700 | |
---|---|---|
committer | 2016-03-22 07:23:24 -0700 | |
commit | f809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch) | |
tree | 38fa4182df2c735459e43b0eaaa073c1ef8c612d /gm/colorcube.cpp | |
parent | cfcd1819d1431bbe5812c174fc337d3678d63f06 (diff) |
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
Review URL: https://codereview.chromium.org/1822623002
Diffstat (limited to 'gm/colorcube.cpp')
-rw-r--r-- | gm/colorcube.cpp | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/gm/colorcube.cpp b/gm/colorcube.cpp index 01aaf15610..54e0688c6a 100644 --- a/gm/colorcube.cpp +++ b/gm/colorcube.cpp @@ -25,27 +25,12 @@ static sk_sp<SkShader> MakeLinear() { class ColorCubeGM : public GM { public: - ColorCubeGM() - : fInitialized(false) - , f3DLut4(nullptr) - , f3DLut8(nullptr) - , f3DLut16(nullptr) - , f3DLut32(nullptr) - , f3DLut64(nullptr) - { + ColorCubeGM() : fInitialized(false) { this->setBGColor(0xFF000000); } - ~ColorCubeGM() { - SkSafeUnref(f3DLut4); - SkSafeUnref(f3DLut8); - SkSafeUnref(f3DLut16); - SkSafeUnref(f3DLut32); - SkSafeUnref(f3DLut64); - } - protected: - virtual SkString onShortName() { + SkString onShortName() override { return SkString("colorcube"); } @@ -67,8 +52,8 @@ protected: canvas.drawRect(SkRect::MakeWH(80, 80), paint); } - void make_3Dlut(SkData** data, int size, bool invR, bool invG, bool invB) { - *data = SkData::NewUninitialized(sizeof(SkColor) * size * size * size); + void make_3Dlut(sk_sp<SkData>* data, int size, bool invR, bool invG, bool invB) { + *data = SkData::MakeUninitialized(sizeof(SkColor) * size * size * size); SkColor* pixels = (SkColor*)((*data)->writable_data()); SkAutoTMalloc<uint8_t> lutMemory(size); SkAutoTMalloc<uint8_t> invLutMemory(size); @@ -92,11 +77,11 @@ protected: } } - virtual SkISize onISize() { + SkISize onISize() override { return SkISize::Make(500, 100); } - virtual void onDraw(SkCanvas* canvas) { + void onDraw(SkCanvas* canvas) override { if (!fInitialized) { this->make_bitmap(); this->make_3Dluts(); @@ -104,19 +89,19 @@ protected: } canvas->clear(0x00000000); SkPaint paint; - paint.setColorFilter(SkColorCubeFilter::Create(f3DLut4, 4))->unref(); + paint.setColorFilter(SkColorCubeFilter::Make(f3DLut4, 4)); canvas->drawBitmap(fBitmap, 10, 10, &paint); - paint.setColorFilter(SkColorCubeFilter::Create(f3DLut8, 8))->unref(); + paint.setColorFilter(SkColorCubeFilter::Make(f3DLut8, 8)); canvas->drawBitmap(fBitmap, 110, 10, &paint); - paint.setColorFilter(SkColorCubeFilter::Create(f3DLut16, 16))->unref(); + paint.setColorFilter(SkColorCubeFilter::Make(f3DLut16, 16)); canvas->drawBitmap(fBitmap, 210, 10, &paint); - paint.setColorFilter(SkColorCubeFilter::Create(f3DLut32, 32))->unref(); + paint.setColorFilter(SkColorCubeFilter::Make(f3DLut32, 32)); canvas->drawBitmap(fBitmap, 310, 10, &paint); - paint.setColorFilter(SkColorCubeFilter::Create(f3DLut64, 64))->unref(); + paint.setColorFilter(SkColorCubeFilter::Make(f3DLut64, 64)); canvas->drawBitmap(fBitmap, 410, 10, &paint); } @@ -124,11 +109,11 @@ private: typedef GM INHERITED; bool fInitialized; SkBitmap fBitmap; - SkData* f3DLut4; - SkData* f3DLut8; - SkData* f3DLut16; - SkData* f3DLut32; - SkData* f3DLut64; + sk_sp<SkData> f3DLut4; + sk_sp<SkData> f3DLut8; + sk_sp<SkData> f3DLut16; + sk_sp<SkData> f3DLut32; + sk_sp<SkData> f3DLut64; }; ////////////////////////////////////////////////////////////////////////////// |