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/image | |
| 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/image')
| -rw-r--r-- | src/image/SkImage.cpp | 1 | ||||
| -rw-r--r-- | src/image/SkImage_Lazy.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkImage_Lazy.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 9652aab22d..5825fd91ca 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -7,6 +7,7 @@ #include "SkBitmap.h" #include "SkBitmapCache.h" +#include "SkCachedData.h" #include "SkCanvas.h" #include "SkColorSpacePriv.h" #include "SkData.h" diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp index fa88db1ba9..2107251687 100644 --- a/src/image/SkImage_Lazy.cpp +++ b/src/image/SkImage_Lazy.cpp @@ -9,6 +9,7 @@ #include "SkBitmap.h" #include "SkBitmapCache.h" +#include "SkCachedData.h" #include "SkData.h" #include "SkImageGenerator.h" #include "SkImagePriv.h" @@ -282,7 +283,6 @@ sk_sp<SkImage> SkImage::MakeFromGenerator(std::unique_ptr<SkImageGenerator> gene void SkImage_Lazy::makeCacheKeyFromOrigKey(const GrUniqueKey& origKey, GrUniqueKey* cacheKey) const { - // TODO: Take dstColorSpace, include hash in key SkASSERT(!cacheKey->isValid()); if (origKey.isValid()) { static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain(); diff --git a/src/image/SkImage_Lazy.h b/src/image/SkImage_Lazy.h index 780098aacb..bfba3b15cf 100644 --- a/src/image/SkImage_Lazy.h +++ b/src/image/SkImage_Lazy.h @@ -69,7 +69,6 @@ public: bool willBeMipped, GrTextureMaker::AllowedTexGenType genType) const; - // TODO: Need to pass in dstColorSpace to fold into key here? void makeCacheKeyFromOrigKey(const GrUniqueKey& origKey, GrUniqueKey* cacheKey) const; #endif |