commit 021ed51dc6a93ceaa0f1ad728b16c660dc220f70
author Brian Osman <brianosman@google.com> Tue Oct 16 15:19:44 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 16 20:17:27 2018 +0000
tree 44d4385b53237f41c4f688eb83895d163e9f178d
parent e3a5b1960dfb7380b116ed3e93d3a1c930139a09

Switch gradients from GrColor4f to SkPMColor4f

This is the most misleading use-case, because these values are either
premul or unpremul depending on the gradient's flags. It turns out that
we only need to "lie" and alias in one spot, though, so I think this is
better than adding an entirely new kUnknown_SkAlphaType specialization
of SkRGBA4f.

Bug: skia:
Change-Id: I4b7e280355219d439f50a7fe54230ea17715abc3
Reviewed-on: https://skia-review.googlesource.com/c/162745
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/gradients/GrClampedGradientEffect.cpp

diff --git a/src/gpu/gradients/GrClampedGradientEffect.cpp b/src/gpu/gradients/GrClampedGradientEffect.cpp
index 409549c..21a5b1c 100644
--- a/src/gpu/gradients/GrClampedGradientEffect.cpp
+++ b/src/gpu/gradients/GrClampedGradientEffect.cpp
@@ -59,20 +59,20 @@
                    const GrFragmentProcessor& _proc) override {
         const GrClampedGradientEffect& _outer = _proc.cast<GrClampedGradientEffect>();
         {
-            const GrColor4f& leftBorderColorValue = _outer.leftBorderColor();
+            const SkPMColor4f& leftBorderColorValue = _outer.leftBorderColor();
             if (fLeftBorderColorPrev != leftBorderColorValue) {
                 fLeftBorderColorPrev = leftBorderColorValue;
-                pdman.set4fv(fLeftBorderColorVar, 1, leftBorderColorValue.fRGBA);
+                pdman.set4fv(fLeftBorderColorVar, 1, leftBorderColorValue.vec());
             }
-            const GrColor4f& rightBorderColorValue = _outer.rightBorderColor();
+            const SkPMColor4f& rightBorderColorValue = _outer.rightBorderColor();
             if (fRightBorderColorPrev != rightBorderColorValue) {
                 fRightBorderColorPrev = rightBorderColorValue;
-                pdman.set4fv(fRightBorderColorVar, 1, rightBorderColorValue.fRGBA);
+                pdman.set4fv(fRightBorderColorVar, 1, rightBorderColorValue.vec());
             }
         }
     }
-    GrColor4f fLeftBorderColorPrev = GrColor4f::kIllegalConstructor;
-    GrColor4f fRightBorderColorPrev = GrColor4f::kIllegalConstructor;
+    SkPMColor4f fLeftBorderColorPrev = {SK_FloatNaN, SK_FloatNaN, SK_FloatNaN, SK_FloatNaN};
+    SkPMColor4f fRightBorderColorPrev = {SK_FloatNaN, SK_FloatNaN, SK_FloatNaN, SK_FloatNaN};
     UniformHandle fLeftBorderColorVar;
     UniformHandle fRightBorderColorVar;
 };