Revert of Support Float32 output from SkColorSpaceXform

src/codec/SkCodecPriv.h

 /*
  * Copyright 2015 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
@@ skipping 126 matching lines @@
     }
 }
 
 /*
  * If there is a color table, get a pointer to the colors, otherwise return nullptr
  */
 static inline const SkPMColor* get_color_ptr(SkColorTable* colorTable) {
      return nullptr != colorTable ? colorTable->readColors() : nullptr;
 }
 
-static inline SkColorSpaceXform::ColorFormat select_xform_format(SkColorType colorType) {
-    switch (colorType) {
-        case kRGBA_8888_SkColorType:
-            return SkColorSpaceXform::kRGBA_8888_ColorFormat;
-        case kBGRA_8888_SkColorType:
-            return SkColorSpaceXform::kBGRA_8888_ColorFormat;
-        case kRGBA_F16_SkColorType:
-            return SkColorSpaceXform::kRGBA_F16_ColorFormat;
-        default:
-            SkASSERT(false);
-            return SkColorSpaceXform::kRGBA_8888_ColorFormat;
-    }
-}
-
 /*
  * Given that the encoded image uses a color table, return the fill value
  */
 static inline uint64_t get_color_table_fill_value(SkColorType colorType, SkAlphaType alphaType,
         const SkPMColor* colorPtr, uint8_t fillIndex, SkColorSpaceXform* colorXform) {
     SkASSERT(nullptr != colorPtr);
     switch (colorType) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
             return colorPtr[fillIndex];
         case kRGB_565_SkColorType:
             return SkPixel32ToPixel16(colorPtr[fillIndex]);
         case kIndex_8_SkColorType:
             return fillIndex;
         case kRGBA_F16_SkColorType: {
             SkASSERT(colorXform);
             uint64_t dstColor;
             uint32_t srcColor = colorPtr[fillIndex];
-            colorXform->apply(&dstColor, &srcColor, 1, select_xform_format(colorType), alphaType);
+            colorXform->apply(&dstColor, &srcColor, 1, colorType, alphaType);
             return dstColor;
         }
         default:
             SkASSERT(false);
             return 0;
     }
 }
 
 /*
  *
@@ skipping 160 matching lines @@
 
     // Need a color xform when dst space does not match the src.
     bool srcDstNotEqual = !SkColorSpace::Equals(srcInfo.colorSpace(), dstInfo.colorSpace());
 
     // We never perform a color xform in legacy mode.
     bool isLegacy = nullptr == dstInfo.colorSpace();
 
     return !isLegacy && (needsPremul || isF16 || srcDstNotEqual);
 }
 
-static inline SkAlphaType select_xform_alpha(SkAlphaType dstAlphaType, SkAlphaType srcAlphaType) {
+static inline SkAlphaType select_alpha_xform(SkAlphaType dstAlphaType, SkAlphaType srcAlphaType) {
     return (kOpaque_SkAlphaType == srcAlphaType) ? kOpaque_SkAlphaType : dstAlphaType;
 }
 
 /*
  * Alpha Type Conversions
  * - kOpaque to kOpaque, kUnpremul, kPremul is valid
  * - kUnpremul to kUnpremul, kPremul is valid
  *
  * Color Type Conversions
  * - Always support kRGBA_8888, kBGRA_8888
@@ skipping 21 matching lines @@
             return kOpaque_SkAlphaType == src.alphaType() && !needs_color_xform(dst, src);
         case kGray_8_SkColorType:
             return kGray_8_SkColorType == src.colorType() &&
                    kOpaque_SkAlphaType == src.alphaType() && !needs_color_xform(dst, src);
         default:
             return false;
     }
 }
 
 #endif // SkCodecPriv_DEFINED