diff options
| author | android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> | 2023-06-29 20:17:38 +0000 |
|---|---|---|
| committer | Sally Qi <sallyqi@google.com> | 2023-07-14 00:50:18 +0000 |
| commit | da7b2e8ae90fce140e68221cdb3a23219bb01468 (patch) | |
| tree | e2ad96b82fadbfef74b97812a19b0c2b0ae4e35f | |
| parent | 6b9ad739c33975e0ec73bf116c834d5e86616c8e (diff) | |
| download | skia-da7b2e8ae90fce140e68221cdb3a23219bb01468.tar.gz | |
RESTRICT AUTOMERGE Roll Skia from d64928640a1b to ae193d0cc7e3 (1 revision)
https://skia.googlesource.com/skia.git/+log/d64928640a1b..ae193d0cc7e3
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-u-release-autoroll
Please CC rmistry@google.com,scroggo@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Bug: b/289111414
Bug: b/186777432
Bug: b/290581028
Change-Id: I52ae114bd1a95a66814883911b331cb4865eb829
| -rw-r--r-- | client_utils/android/BitmapRegionDecoder.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/client_utils/android/BitmapRegionDecoder.cpp b/client_utils/android/BitmapRegionDecoder.cpp index 110dc0fe23..c5262b886a 100644 --- a/client_utils/android/BitmapRegionDecoder.cpp +++ b/client_utils/android/BitmapRegionDecoder.cpp @@ -79,10 +79,6 @@ bool BitmapRegionDecoder::decodeRegion(SkBitmap* bitmap, BRDAllocator* allocator } SkISize scaledSize = fCodec->getSampledSubsetDimensions(sampleSize, subset); - if (fCodec->getInfo().colorType() == kGray_8_SkColorType) { - dstColorType = kGray_8_SkColorType; - } - // Create the image info for the decode SkAlphaType dstAlphaType = fCodec->computeOutputAlphaType(requireUnpremul); SkImageInfo decodeInfo = |