Perform color correction on png decodes

src/core/SkColorSpaceXform.cpp

Index: src/core/SkColorSpaceXform.cpp
diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp
index 4a7f17508206afa245281e74fe459d31ff45c036..d4b0fa6da772e0a2e67424f9a88dd439bf14d332 100644
--- a/src/core/SkColorSpaceXform.cpp
+++ b/src/core/SkColorSpaceXform.cpp
@@ -636,7 +636,7 @@ void SkColorSpaceXform_Base<SkColorSpace::kSRGB_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_srgb(dst, src, len, fSrcGammaTables, fSrcToDst);
+    SkOpts::color_xform_RGBA_to_srgb(dst, src, len, fSrcGammaTables, fSrcToDst);
 }
 
 template <>
@@ -648,7 +648,7 @@ void SkColorSpaceXform_Base<SkColorSpace::k2Dot2Curve_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_2dot2(dst, src, len, fSrcGammaTables, fSrcToDst);
+    SkOpts::color_xform_RGBA_to_2dot2(dst, src, len, fSrcGammaTables, fSrcToDst);
 }
 
 template <>
@@ -660,7 +660,44 @@ void SkColorSpaceXform_Base<SkColorSpace::kNonStandard_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_table(dst, src, len, fSrcGammaTables, fSrcToDst, fDstGammaTables);
+    SkOpts::color_xform_RGBA_to_table(dst, src, len, fSrcGammaTables, fSrcToDst, fDstGammaTables);
+}
+
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::kSRGB_GammaNamed>
+::applyToRGBAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_srgb_premul(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::k2Dot2Curve_GammaNamed>
+::applyToRGBAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_2dot2_premul(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::kNonStandard_GammaNamed>
+::applyToRGBAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_table_premul(dst, src, len, fSrcGammaTables, fSrcToDst,
+                                             fDstGammaTables);
 }
 
 template <>
@@ -672,7 +709,7 @@ void SkColorSpaceXform_Base<SkColorSpace::kSRGB_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_srgb_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
+    SkOpts::color_xform_RGBA_to_srgb_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
 }
 
 template <>
@@ -684,7 +721,7 @@ void SkColorSpaceXform_Base<SkColorSpace::k2Dot2Curve_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_2dot2_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
+    SkOpts::color_xform_RGBA_to_2dot2_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
 }
 
 template <>
@@ -696,10 +733,47 @@ void SkColorSpaceXform_Base<SkColorSpace::kNonStandard_GammaNamed>
         src = dst;
     }
 
-    SkOpts::color_xform_RGB1_to_table_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst,
+    SkOpts::color_xform_RGBA_to_table_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst,
                                              fDstGammaTables);
 }
 
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::kSRGB_GammaNamed>
+::applyToBGRAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_srgb_premul_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::k2Dot2Curve_GammaNamed>
+::applyToBGRAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_2dot2_premul_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <>
+void SkColorSpaceXform_Base<SkColorSpace::kNonStandard_GammaNamed>
+::applyToBGRAPremul(SkPMColor* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        handle_color_lut(dst, src, len, fColorLUT.get());
+        src = dst;
+    }
+
+    SkOpts::color_xform_RGBA_to_table_premul_swaprb(dst, src, len, fSrcGammaTables, fSrcToDst,
+                                                    fDstGammaTables);
+}
+
 template <SkColorSpace::GammaNamed T>
 void SkColorSpaceXform_Base<T>
 ::applyToF16(RGBAF16* dst, const RGBA32* src, int len) const
@@ -717,5 +791,56 @@ void SkColorSpaceXform_Base<T>
         src = (const RGBA32*) storage.get();
     }
 
-    SkOpts::color_xform_RGB1_to_linear(dst, src, len, fSrcGammaTables, fSrcToDst);
+    SkOpts::color_xform_RGBA_to_linear(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <SkColorSpace::GammaNamed T>
+void SkColorSpaceXform_Base<T>
+::applyToF16Premul(RGBAF16* dst, const RGBA32* src, int len) const
+{
+    if (fColorLUT) {
+        size_t storageBytes = len * sizeof(RGBA32);
+#if defined(GOOGLE3)
+        // Stack frame size is limited in GOOGLE3.
+        SkAutoSMalloc<256 * sizeof(RGBA32)> storage(storageBytes);
+#else
+        SkAutoSMalloc<1024 * sizeof(RGBA32)> storage(storageBytes);
+#endif
+
+        handle_color_lut((RGBA32*) storage.get(), src, len, fColorLUT.get());
+        src = (const RGBA32*) storage.get();
+    }
+
+    SkOpts::color_xform_RGBA_to_linear_premul(dst, src, len, fSrcGammaTables, fSrcToDst);
+}
+
+template <SkColorSpace::GammaNamed T>
+void SkColorSpaceXform_Base<T>
+::apply(void* dst, const RGBA32* src, int len, SkColorType dstColorType, bool premul) const
+{
+    if (premul) {
+        switch (dstColorType) {
+            case kRGBA_8888_SkColorType:
+                return this->applyToRGBAPremul((RGBA32*) dst, src, len);
+            case kBGRA_8888_SkColorType:
+                return this->applyToBGRAPremul((BGRA32*) dst, src, len);
+            case kRGBA_F16_SkColorType:
+                return this->applyToF16Premul((RGBAF16*) dst, src, len);
+            default:
+                SkASSERT(false);
+                return;
+        }
+    }
+
+    switch (dstColorType) {
+        case kRGBA_8888_SkColorType:
+            return this->applyToRGBA((RGBA32*) dst, src, len);
+        case kBGRA_8888_SkColorType:
+            return this->applyToBGRA((BGRA32*) dst, src, len);
+        case kRGBA_F16_SkColorType:
+            return this->applyToF16((RGBAF16*) dst, src, len);
+        default:
+            SkASSERT(false);
+            return;
+    }
 }