Revert of Support Float32 output from SkColorSpaceXform

bench/ColorCodecBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "ColorCodecBench.h"
 #include "Resources.h"
 #include "SkCodec.h"
-#include "SkCodecPriv.h"
 #include "SkColorSpaceXform.h"
 #include "SkCommandLineFlags.h"
 
 #if defined(SK_TEST_QCMS)
 DEFINE_bool(qcms,       false, "Bench qcms color conversion");
 #endif
 DEFINE_bool(xform_only, false, "Only time the color xform, do not include the decode time");
 DEFINE_bool(srgb,       false, "Convert to srgb dst space");
 DEFINE_bool(half,       false, "Convert to half floats");
 
@@ skipping 71 matching lines @@
     sk_sp<SkColorSpace> srcSpace = SkColorSpace::NewICC(fSrcData->data(), fSrcData->size());
     if (!srcSpace) {
         srcSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
     }
     std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(srcSpace, fDstSpace);
     SkASSERT(xform);
 
     void* dst = fDst.get();
     void* src = fSrc.get();
     for (int y = 0; y < fSrcInfo.height(); y++) {
-        xform->apply(dst, (uint32_t*) src, fSrcInfo.width(),
-                     select_xform_format(fDstInfo.colorType()), fDstInfo.alphaType());
+        xform->apply(dst, (uint32_t*) src, fSrcInfo.width(), fDstInfo.colorType(),
+                     fDstInfo.alphaType());
         dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
         src = SkTAddOffset<void>(src, fSrcInfo.minRowBytes());
     }
 }
 
 #if defined(SK_TEST_QCMS)
 void ColorCodecBench::xformOnlyQCMS() {
     SkAutoTCallVProc<qcms_profile, qcms_profile_release>
             srcSpace(qcms_profile_from_memory(fSrcData->data(), fSrcData->size()));
     SkASSERT(srcSpace);
@@ skipping 90 matching lines @@
 #endif
         {
             if (FLAGS_xform_only) {
                 this->xformOnly();
             } else {
                 this->decodeAndXform();
             }
         }
     }
 }