From 3d86ff86d744de6f8ded1df1487627144554ccb5 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 21 Feb 2019 14:00:01 -0500 Subject: [PATCH] Remove SK_SUPPORT_LEGACY_ANDROID_CODEC_COLORSPACE Bug: b/123377741 Android no longer defines this flag, so remove the dead code. Change-Id: I35bce8a0677ee86730effa6be297ad9718cee1c2 Reviewed-on: https://skia-review.googlesource.com/c/194001 Commit-Queue: Leon Scroggins Commit-Queue: Derek Sollenberger Auto-Submit: Leon Scroggins Reviewed-by: Derek Sollenberger --- src/codec/SkAndroidCodec.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index 1561d31fd6..2d2b20abaa 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -162,17 +162,8 @@ SkAlphaType SkAndroidCodec::computeOutputAlphaType(bool requestedUnpremul) { sk_sp SkAndroidCodec::computeOutputColorSpace(SkColorType outputColorType, sk_sp prefColorSpace) { switch (outputColorType) { -#ifdef SK_SUPPORT_LEGACY_ANDROID_CODEC_COLORSPACE - case kRGBA_F16_SkColorType: - // Note that |prefColorSpace| is ignored, F16 is always linear sRGB. - return SkColorSpace::MakeSRGBLinear(); - case kRGB_565_SkColorType: - // Note that |prefColorSpace| is ignored, 565 is always sRGB. - return SkColorSpace::MakeSRGB(); -#else case kRGBA_F16_SkColorType: case kRGB_565_SkColorType: -#endif case kRGBA_8888_SkColorType: case kBGRA_8888_SkColorType: { // If |prefColorSpace| is supplied, choose it.