commit fbc6d7fcf6e80883a9bed6ff7bb0323ed8557ee2
author Brian Osman <brianosman@google.com> Wed Aug 15 11:16:06 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 22 17:03:45 2018 +0000
tree c991394521aa2acf1bba776097a3718eb598ae06
parent c02165fae11402933e23ad2bb080862220b5a1a8

Make SkColor4f <-> SkColor skip sRGB conversion

This lets us remove the old S32 functions, and fix a couple bugs.
I think this is a good first step to using SkColor4f for paint colors.

Bug: skia:
Change-Id: I0337c2b6db29b73c2f682f85b9cf68c985de7cce
Reviewed-on: https://skia-review.googlesource.com/147205
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

gm/hsl.cpp

diff --git a/gm/hsl.cpp b/gm/hsl.cpp
index 39074e2..a4c9657 100644
--- a/gm/hsl.cpp
+++ b/gm/hsl.cpp
@@ -130,35 +130,17 @@
 }
 
 static SkColor blend(SkColor dst, SkColor src,
-                     void (*mode)(float,float,float, float*,float*,float*),
-                     bool legacy) {
+                     void (*mode)(float,float,float, float*,float*,float*)) {
 
     SkASSERT(SkColorGetA(dst) == 0xff
           && SkColorGetA(src) == 0xff);   // Not fundamental, just simplifying for this GM.
 
-    auto to_float = [&](SkColor c) {
-        if (legacy) {
-            return SkColor4f{
-                SkColorGetR(c) * (1/255.0f),
-                SkColorGetG(c) * (1/255.0f),
-                SkColorGetB(c) * (1/255.0f),
-                1.0f,
-            };
-        }
-        return SkColor4f::FromColor(c);
-    };
-
-    SkColor4f d = to_float(dst),
-              s = to_float(src);
+    SkColor4f d = SkColor4f::FromColor(dst),
+              s = SkColor4f::FromColor(src);
 
     mode( d.fR,  d.fG,  d.fB,
          &s.fR, &s.fG, &s.fB);
 
-    if (legacy) {
-        return SkColorSetRGB(s.fR * 255.0f + 0.5f,
-                             s.fG * 255.0f + 0.5f,
-                             s.fB * 255.0f + 0.5f);
-    }
     return s.toSkColor();
 }
 
@@ -186,7 +168,6 @@
         { SkBlendMode::kColor,      color      },
         { SkBlendMode::kLuminosity, luminosity },
     };
-    bool legacy = !canvas->imageInfo().colorSpace();
     for (auto test : tests) {
         canvas->drawRect({20,20,80,80}, bg);
 
@@ -195,7 +176,7 @@
 
         if (test.reference) {
             SkPaint ref;
-            ref.setColor(blend(bg.getColor(), fg.getColor(), test.reference, legacy));
+            ref.setColor(blend(bg.getColor(), fg.getColor(), test.reference));
             canvas->drawCircle(50,50, 20, ref);
         }