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/android | |
| 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/android')
| -rw-r--r-- | src/android/SkBitmapRegionCodec.cpp | 5 | ||||
| -rw-r--r-- | src/android/SkBitmapRegionCodec.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp index e2ab423d27..f77c70264f 100644 --- a/src/android/SkBitmapRegionCodec.cpp +++ b/src/android/SkBitmapRegionCodec.cpp @@ -116,8 +116,3 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat return true; } - -bool SkBitmapRegionCodec::conversionSupported(SkColorType colorType) { - SkImageInfo dstInfo = fCodec->getInfo().makeColorType(colorType); - return conversion_possible(dstInfo, fCodec->getInfo()); -} diff --git a/src/android/SkBitmapRegionCodec.h b/src/android/SkBitmapRegionCodec.h index a7cfe33a91..94194c089f 100644 --- a/src/android/SkBitmapRegionCodec.h +++ b/src/android/SkBitmapRegionCodec.h @@ -28,8 +28,6 @@ public: SkColorType colorType, bool requireUnpremul, sk_sp<SkColorSpace> prefColorSpace) override; - bool conversionSupported(SkColorType colorType) override; - SkEncodedImageFormat getEncodedFormat() override { return fCodec->getEncodedFormat(); } SkColorType computeOutputColorType(SkColorType requestedColorType) override { |