diff options
Diffstat (limited to 'gm/samplerstress.cpp')
-rw-r--r-- | gm/samplerstress.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp index 4bec6784a8..f317cf9103 100644 --- a/gm/samplerstress.cpp +++ b/gm/samplerstress.cpp @@ -21,13 +21,9 @@ class SamplerStressGM : public GM { public: SamplerStressGM() : fTextureCreated(false) - , fShader(nullptr) , fMaskFilter(nullptr) { } - virtual ~SamplerStressGM() { - } - protected: SkString onShortName() override { @@ -69,15 +65,14 @@ protected: } void createShader() { - if (fShader.get()) { + if (fShader) { return; } createTexture(); - fShader.reset(SkShader::CreateBitmapShader(fTexture, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode)); + fShader = SkShader::MakeBitmapShader(fTexture, SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode); } void createMaskFilter() { @@ -140,9 +135,9 @@ protected: } private: - SkBitmap fTexture; - bool fTextureCreated; - SkAutoTUnref<SkShader> fShader; + SkBitmap fTexture; + bool fTextureCreated; + sk_sp<SkShader> fShader; SkAutoTUnref<SkMaskFilter> fMaskFilter; typedef GM INHERITED; |