#include "SkBitmapProcShader.h"
#include "SkCanvas.h"
#include "SkImage.h"
-#include "SkImageGenerator.h"
#include "SkMatrixUtils.h"
#include "SkPicture.h"
#include "SkReadBuffer.h"
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;
}
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())));
}