AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkPictureShader cleanup

Browse Source 
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
This commit is contained in:
fmalita 2016-02-01 09:19:49 -08:00 committed by Commit bot
parent b1fe8f6f6f
commit 40bed64ff0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/SkPictureShader.cpp
View File

@ -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())));
}