diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-08-15 12:24:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-17 16:09:31 +0000 |
| commit | 0741818e7ab4e9ea8505b8a8687412f0e3804c65 (patch) | |
| tree | ac183b3107e97b0717319fd403f6d552fdbd840f /src/codec/SkIcoCodec.h | |
| parent | de44c2df9469e70f57f05d262cd1a245b2ff5e90 (diff) | |
Move calls to conversion_possible to SkCodec
Move common code into the base class, so subclasses need not call
conversion_possible.
Use SkEncodedInfo rather than SkImageInfo, and use the proper frame.
API Changes:
- SkAndroidCodec:
- Add getEncodedInfo(), for SkBitmapRegionCodec
- SkEncodedInfo:
- Add opaque() helper
- SkBitmapRegionDecoder:
- Remove unused conversionSupported
(Split off from skia-review.googlesource.com/c/25746)
Bug: skia:5601
Change-Id: If4a40d4b98a3dd0afde2b6058f92315a393a5baf
Reviewed-on: https://skia-review.googlesource.com/34361
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkIcoCodec.h')
| -rw-r--r-- | src/codec/SkIcoCodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/codec/SkIcoCodec.h b/src/codec/SkIcoCodec.h index aa19c9b935..62de20f9ff 100644 --- a/src/codec/SkIcoCodec.h +++ b/src/codec/SkIcoCodec.h @@ -48,6 +48,12 @@ protected: SkScanlineOrder onGetScanlineOrder() const override; + bool conversionSupported(const SkImageInfo&, SkEncodedInfo::Color, bool, + const SkColorSpace*) const override { + // This will be checked by the embedded codec. + return true; + } + private: Result onStartScanlineDecode(const SkImageInfo& dstInfo, |