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 /tests/CodecTest.cpp | |
| 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 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 4e68cd1ac6..6ffc44874c 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -1138,14 +1138,16 @@ static void test_conversion_possible(skiatest::Reporter* r, const char* path, if (supportsScanlineDecoder) { REPORTER_ASSERT(r, SkCodec::kInvalidConversion == result); } else { - REPORTER_ASSERT(r, SkCodec::kUnimplemented == result); + REPORTER_ASSERT(r, SkCodec::kUnimplemented == result + || SkCodec::kInvalidConversion == result); } result = codec->startIncrementalDecode(infoF16, bm.getPixels(), bm.rowBytes()); if (supportsIncrementalDecoder) { REPORTER_ASSERT(r, SkCodec::kInvalidConversion == result); } else { - REPORTER_ASSERT(r, SkCodec::kUnimplemented == result); + REPORTER_ASSERT(r, SkCodec::kUnimplemented == result + || SkCodec::kInvalidConversion == result); } SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(infoF16.colorSpace())->type()); |