diff options
| author |  Brian Osman <brianosman@google.com> | 2017-04-25 10:02:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-25 17:59:54 +0000 |
| commit | 4785897c962c02dd6f92b37850dec527f34387f8 (patch) | |
| tree | ebbb1153baa94114cc93343c7b788e85197a34f0 /src/image | |
| parent | bc096bffcbc9b640c09010247994cd64e064384a (diff) | |
Remove compressed texture support from cacherator
All variants of (on)?[rR]efEncoded(Data)? no longer need a GrContext
parameter.
Bug: skia:5485 skia:4971
Change-Id: If4f5e785718d5522eb3df8588318ccb8a02a5749
Reviewed-on: https://skia-review.googlesource.com/14269
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage.cpp | 3 | ||||
| -rw-r--r-- | src/image/SkImage_Base.h | 3 | ||||
| -rw-r--r-- | src/image/SkImage_Lazy.cpp | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 9866acf3f9..6e4d32e8df 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -130,8 +130,7 @@ SkData* SkImage::encode(SkPixelSerializer* serializer) const { } SkData* SkImage::refEncoded() const { - GrContext* ctx = nullptr; // should we allow the caller to pass in a ctx? - return as_IB(this)->onRefEncoded(ctx); + return as_IB(this)->onRefEncoded(); } sk_sp<SkImage> SkImage::MakeFromEncoded(sk_sp<SkData> encoded, const SkIRect* subset) { diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 062d785679..96fd6e6dca 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -73,8 +73,7 @@ public: virtual sk_sp<SkImage> onMakeSubset(const SkIRect&) const = 0; - // If a ctx is specified, then only gpu-specific formats are requested. - virtual SkData* onRefEncoded(GrContext*) const { return nullptr; } + virtual SkData* onRefEncoded() const { return nullptr; } virtual bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const; diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp index 5fd0f61a53..99995d17aa 100644 --- a/src/image/SkImage_Lazy.cpp +++ b/src/image/SkImage_Lazy.cpp @@ -34,7 +34,7 @@ public: SkScalar scaleAdjust[2]) const override; #endif SkImageCacherator* peekCacherator() const override { return &fCache; } - SkData* onRefEncoded(GrContext*) const override; + SkData* onRefEncoded() const override; sk_sp<SkImage> onMakeSubset(const SkIRect&) const override; bool getROPixels(SkBitmap*, SkColorSpace* dstColorSpace, CachingHint) const override; bool onIsLazyGenerated() const override { return true; } @@ -74,8 +74,8 @@ bool SkImage_Lazy::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, siz return false; } -SkData* SkImage_Lazy::onRefEncoded(GrContext* ctx) const { - return fCache.refEncoded(ctx); +SkData* SkImage_Lazy::onRefEncoded() const { + return fCache.refEncoded(); } bool SkImage_Lazy::getROPixels(SkBitmap* bitmap, SkColorSpace* dstColorSpace, |