diff options
| author | Brian Osman <brianosman@google.com> | 2018-10-22 16:10:44 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-10-23 14:28:12 +0000 |
| commit | b70fd9168111a9cc090a766ec68a8e7595cfb738 (patch) | |
| tree | 167ba6836d8bf63b1671118e89029f81e47419d3 /src/shaders | |
| parent | f84ded269e7ab95d165b3231bc35498afc1b1fe7 (diff) | |
| download | skqp-b70fd9168111a9cc090a766ec68a8e7595cfb738.tar.gz | |
Remove colorType and colorSpace from bitmap cache key, and IWYU
Bug: skia:
Change-Id: Ie72cb729af48f4ee2c8d5624b114f3b521dc1059
Reviewed-on: https://skia-review.googlesource.com/c/164041
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/shaders')
| -rw-r--r-- | src/shaders/SkImageShader.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index 07b837ec63..83138069b6 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -100,6 +100,9 @@ SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec, if (fImage->alphaType() == kUnpremul_SkAlphaType) { return nullptr; } + if (fImage->colorType() != kN32_SkColorType) { + return nullptr; + } if (fTileModeX != fTileModeY) { return nullptr; } @@ -113,12 +116,8 @@ SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec, return nullptr; } - SkBitmapProvider provider(fImage.get()); - if (kN32_SkColorType != provider.makeCacheDesc().fColorType) { - return nullptr; - } return SkBitmapProcLegacyShader::MakeContext(*this, fTileModeX, fTileModeY, - provider, rec, alloc); + SkBitmapProvider(fImage.get()), rec, alloc); } #endif |