Perform color correction on png decodes

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"
@@ skipping 81 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++) {
-        // Transform in place
-        FLAGS_half ?
-                xform->applyToF16((uint64_t*) dst, (uint32_t*) src, fSrcInfo.width()) :
-                xform->applyToRGBA((SkPMColor*) dst, (uint32_t*) src, fSrcInfo.width());
+        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 89 matching lines @@
 #endif
         {
             if (FLAGS_xform_only) {
                 this->xformOnly();
             } else {
                 this->decodeAndXform();
             }
         }
     }
 }