diff options
author | reed <reed@google.com> | 2015-08-19 11:46:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 11:46:38 -0700 |
commit | f5822825ec2d5dd24ab476fdd42db2a6573f9756 (patch) | |
tree | 82ceed34d38dc683e63a2cf9c6f75808eaba46ec /src/core/SkPictureShader.cpp | |
parent | 790d74f7c1db73e2938eee6a6eb78bc29be7b851 (diff) |
change asABitmap to isABitmap on shader
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1287263005
Diffstat (limited to 'src/core/SkPictureShader.cpp')
-rw-r--r-- | src/core/SkPictureShader.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index e04e248756..f8c2ab09f8 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -83,12 +83,14 @@ struct BitmapShaderRec : public SkResourceCache::Rec { result->reset(SkRef(rec.fShader.get())); SkBitmap tile; - rec.fShader.get()->asABitmap(&tile, NULL, NULL); - // FIXME: this doesn't protect the pixels from being discarded as soon as we unlock. - // Should be handled via a pixel ref generator instead - // (https://code.google.com/p/skia/issues/detail?id=3220). - SkAutoLockPixels alp(tile, true); - return tile.getPixels() != NULL; + if (rec.fShader.get()->isABitmap(&tile, NULL, NULL)) { + // FIXME: this doesn't protect the pixels from being discarded as soon as we unlock. + // Should be handled via a pixel ref generator instead + // (https://code.google.com/p/skia/issues/detail?id=3220). + SkAutoLockPixels alp(tile, true); + return tile.getPixels() != NULL; + } + return false; } }; |