Delete SkDefaultXform, handle edge cases in SkColorSpaceXform_Base

src/opts/SkColorXform_opts.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkColorXform_opts_DEFINED
 #define SkColorXform_opts_DEFINED
 
@@ skipping 22 matching lines @@
     kTable_DstGamma,
 
     // F16
     kLinear_DstGamma,
 };
 
 template <DstGamma kDstGamma>
 static void color_xform_RGB1(void* dst, const uint32_t* src, int len,
                              const float* const srcTables[3], const float matrix[16],
                              const uint8_t* const dstTables[3]) {
-    Sk4f rXgXbX = Sk4f::Load(matrix + 0),
-         rYgYbY = Sk4f::Load(matrix + 4),
-         rZgZbZ = Sk4f::Load(matrix + 8);
+    Sk4f rXgXbX = Sk4f::Load(matrix +  0),
+         rYgYbY = Sk4f::Load(matrix +  4),
+         rZgZbZ = Sk4f::Load(matrix +  8),
+         rTgTbT = Sk4f::Load(matrix + 12);
 
     if (len >= 4) {
         Sk4f reds, greens, blues;
         auto load_next_4 = [&reds, &greens, &blues, &src, &len, &srcTables] {
             reds   = Sk4f{srcTables[0][(src[0] >>  0) & 0xFF],
                           srcTables[0][(src[1] >>  0) & 0xFF],
                           srcTables[0][(src[2] >>  0) & 0xFF],
                           srcTables[0][(src[3] >>  0) & 0xFF]};
             greens = Sk4f{srcTables[1][(src[0] >>  8) & 0xFF],
                           srcTables[1][(src[1] >>  8) & 0xFF],
                           srcTables[1][(src[2] >>  8) & 0xFF],
                           srcTables[1][(src[3] >>  8) & 0xFF]};
             blues  = Sk4f{srcTables[2][(src[0] >> 16) & 0xFF],
                           srcTables[2][(src[1] >> 16) & 0xFF],
                           srcTables[2][(src[2] >> 16) & 0xFF],
                           srcTables[2][(src[3] >> 16) & 0xFF]};
             src += 4;
             len -= 4;
         };
 
         Sk4f dstReds, dstGreens, dstBlues;
         auto transform_4 = [&reds, &greens, &blues, &dstReds, &dstGreens, &dstBlues, &rXgXbX,
-                            &rYgYbY, &rZgZbZ] {
-            dstReds   = rXgXbX[0]*reds + rYgYbY[0]*greens + rZgZbZ[0]*blues;
-            dstGreens = rXgXbX[1]*reds + rYgYbY[1]*greens + rZgZbZ[1]*blues;
-            dstBlues  = rXgXbX[2]*reds + rYgYbY[2]*greens + rZgZbZ[2]*blues;
+                            &rYgYbY, &rZgZbZ, &rTgTbT] {
+            dstReds   = rXgXbX[0]*reds + rYgYbY[0]*greens + rZgZbZ[0]*blues + rTgTbT[0];
+            dstGreens = rXgXbX[1]*reds + rYgYbY[1]*greens + rZgZbZ[1]*blues + rTgTbT[1];
+            dstBlues  = rXgXbX[2]*reds + rYgYbY[2]*greens + rZgZbZ[2]*blues + rTgTbT[2];
         };
 
         auto store_4 = [&dstReds, &dstGreens, &dstBlues, &dst, &dstTables] {
             if (kSRGB_DstGamma == kDstGamma || k2Dot2_DstGamma == kDstGamma) {
                 Sk4i (*linear_to_curve)(const Sk4f&) =
                         (kSRGB_DstGamma == kDstGamma) ? sk_linear_to_srgb : linear_to_2dot2;
 
                 auto reds   = linear_to_curve(dstReds);
                 auto greens = linear_to_curve(dstGreens);
                 auto blues  = linear_to_curve(dstBlues);
@@ skipping 53 matching lines @@
         transform_4();
         store_4();
     }
 
     while (len > 0) {
         // Splat r,g,b across a register each.
         auto r = Sk4f{srcTables[0][(*src >>  0) & 0xFF]},
              g = Sk4f{srcTables[1][(*src >>  8) & 0xFF]},
              b = Sk4f{srcTables[2][(*src >> 16) & 0xFF]};
 
-        auto dstPixel = rXgXbX*r + rYgYbY*g + rZgZbZ*b;
+        auto dstPixel = rXgXbX*r + rYgYbY*g + rZgZbZ*b + rTgTbT;
 
         if (kSRGB_DstGamma == kDstGamma || k2Dot2_DstGamma == kDstGamma) {
             Sk4i (*linear_to_curve)(const Sk4f&) =
                     (kSRGB_DstGamma == kDstGamma) ? sk_linear_to_srgb : linear_to_2dot2;
 
             auto pixel = linear_to_curve(dstPixel);
 
             uint32_t rgba;
             SkNx_cast<uint8_t>(pixel).store(&rgba);
             rgba |= 0xFF000000;
@@ skipping 40 matching lines @@
 }
 
 static void color_xform_RGB1_to_linear(uint64_t* dst, const uint32_t* src, int len,
                                        const float* const srcTables[3], const float matrix[16]) {
     color_xform_RGB1<kLinear_DstGamma>(dst, src, len, srcTables, matrix, nullptr);
 }
 
 }  // namespace SK_OPTS_NS
 
 #endif // SkColorXform_opts_DEFINED