Perform color correction on png decodes

src/core/SkOpts.cpp

Index: src/core/SkOpts.cpp
diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp
index 9ba7bc7178145a47bba00d718a1cc8fd4c705a02..231a58f11a1f20c28b32f69ad25c204759f36e22 100644
--- a/src/core/SkOpts.cpp
+++ b/src/core/SkOpts.cpp
@@ -72,13 +72,20 @@ namespace SkOpts {
 
     DEFINE_DEFAULT(srcover_srgb_srgb);
 
-    DEFINE_DEFAULT(color_xform_RGB1_to_2dot2);
-    DEFINE_DEFAULT(color_xform_RGB1_to_srgb);
-    DEFINE_DEFAULT(color_xform_RGB1_to_table);
-    DEFINE_DEFAULT(color_xform_RGB1_to_linear);
-    DEFINE_DEFAULT(color_xform_RGB1_to_2dot2_swaprb);
-    DEFINE_DEFAULT(color_xform_RGB1_to_srgb_swaprb);
-    DEFINE_DEFAULT(color_xform_RGB1_to_table_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_2dot2);
+    DEFINE_DEFAULT(color_xform_RGBA_to_srgb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_table);
+    DEFINE_DEFAULT(color_xform_RGBA_to_linear);
+    DEFINE_DEFAULT(color_xform_RGBA_to_2dot2_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_srgb_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_table_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_2dot2_premul);
+    DEFINE_DEFAULT(color_xform_RGBA_to_srgb_premul);
+    DEFINE_DEFAULT(color_xform_RGBA_to_table_premul);
+    DEFINE_DEFAULT(color_xform_RGBA_to_linear_premul);
+    DEFINE_DEFAULT(color_xform_RGBA_to_2dot2_premul_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_srgb_premul_swaprb);
+    DEFINE_DEFAULT(color_xform_RGBA_to_table_premul_swaprb);
 #undef DEFINE_DEFAULT
 
     // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.