diff options
| author |  fmalita <fmalita@chromium.org> | 2016-02-01 09:19:49 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-01 09:19:49 -0800 |
| commit | 40bed64ff0f2dc842f01a0e8ad85c0cec9fab4b5 (patch) | |
| tree | d9377a7d3e0d0e0d1beebfff3246e726bd76c170 /src/core/SkPictureShader.cpp | |
| parent | b1fe8f6f6fbd8380f1b55af382213548c2766b77 (diff) | |
SkPictureShader cleanup
Minor cleanup following http://crrev.com/1405103003.
R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1652943002
Review URL: https://codereview.chromium.org/1652943002
Diffstat (limited to 'src/core/SkPictureShader.cpp')
| -rw-r--r-- | src/core/SkPictureShader.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index 82d6096be5..44f6ef10b5 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -11,7 +11,6 @@ #include "SkBitmapProcShader.h" #include "SkCanvas.h" #include "SkImage.h" -#include "SkImageGenerator.h" #include "SkMatrixUtils.h" #include "SkPicture.h" #include "SkReadBuffer.h" @@ -220,16 +219,8 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, const SkM tileMatrix.setRectToRect(fTile, SkRect::MakeIWH(tileSize.width(), tileSize.height()), SkMatrix::kFill_ScaleToFit); - SkAutoTDelete<SkImageGenerator> tileGenerator( - SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nullptr)); - if (!tileGenerator) { - return nullptr; - } - - // Grab this before the generator goes poof! - const SkImageInfo tileInfo = tileGenerator->getInfo(); - - SkAutoTUnref<SkImage> tileImage(SkImage::NewFromGenerator(tileGenerator.detach())); + SkAutoTUnref<SkImage> tileImage( + SkImage::NewFromPicture(fPicture, tileSize, &tileMatrix, nullptr)); if (!tileImage) { return nullptr; } @@ -238,6 +229,7 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, const SkM shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height()); tileShader.reset(tileImage->newShader(fTmx, fTmy, &shaderMatrix)); + const SkImageInfo tileInfo = SkImageInfo::MakeN32Premul(tileSize); SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(), tileInfo.getSafeSize(tileInfo.minRowBytes()))); } |