diff options
| author |  Brian Osman <brianosman@google.com> | 2018-07-11 09:08:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-11 14:07:08 +0000 |
| commit | c87cfb674bcaf27062dd11f88f1337af70173a11 (patch) | |
| tree | ba2d1a2e7338aaf96bcddbdcb2dd9f7b746dfa23 /src/core/SkPictureImageGenerator.cpp | |
| parent | f730c1820fbab8c29b51738f8dd19cb88c7d5136 (diff) | |
Remove old lazy image decoding heuristic logic
This led to removing a lot of transfer function behavior code. There is
more that could be done, and we need to add in decoding to dst color
space, but this CL is almost entirely mechanical.
Change-Id: I91b2169f95aadcfaacdd2b9821bb1a01ce53f9a6
Reviewed-on: https://skia-review.googlesource.com/140349
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/core/SkPictureImageGenerator.cpp')
| -rw-r--r-- | src/core/SkPictureImageGenerator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index f17ff647ae..0f52dc1d7c 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -56,8 +56,8 @@ SkPictureImageGenerator::SkPictureImageGenerator(const SkImageInfo& info, sk_sp< bool SkPictureImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& opts) { - bool useXformCanvas = - SkTransferFunctionBehavior::kIgnore == opts.fBehavior && info.colorSpace(); + // TODO: Stop using xform canvas and simplify this code once rasterization works the same way + bool useXformCanvas = /* kIgnore == behavior && */ info.colorSpace(); SkSurfaceProps props(0, kUnknown_SkPixelGeometry); SkImageInfo canvasInfo = useXformCanvas ? info.makeColorSpace(nullptr) : info; @@ -99,10 +99,10 @@ SkImageGenerator::MakeFromPicture(const SkISize& size, sk_sp<SkPicture> picture, #if SK_SUPPORT_GPU sk_sp<GrTextureProxy> SkPictureImageGenerator::onGenerateTexture( - GrContext* ctx, const SkImageInfo& info, const SkIPoint& origin, - SkTransferFunctionBehavior behavior, bool willNeedMipMaps) { + GrContext* ctx, const SkImageInfo& info, const SkIPoint& origin, bool willNeedMipMaps) { SkASSERT(ctx); - bool useXformCanvas = SkTransferFunctionBehavior::kIgnore == behavior && info.colorSpace(); + // TODO: Stop using xform canvas and simplify this code once rasterization works the same way + bool useXformCanvas = /* behavior == kIgnore && */ info.colorSpace(); // // TODO: respect the usage, by possibly creating a different (pow2) surface |