Revert[2] of float color components

include/core/SkColor.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkColor_DEFINED
 #define SkColor_DEFINED
 
@@ skipping 142 matching lines @@
 /** Return a SkPMColor value from a SkColor value. This is done by multiplying the color
     components by the color's alpha, and by arranging the bytes in a configuration
     dependent order, to match the format of kARGB32 bitmaps.
 */
 SK_API SkPMColor SkPreMultiplyColor(SkColor c);
 
 /** Define a function pointer type for combining two premultiplied colors
 */
 typedef SkPMColor (*SkXfermodeProc)(SkPMColor src, SkPMColor dst);
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+/*
+ *  The float values are 0...1 premultiplied
+ */
+struct SK_ATTRIBUTE(aligned(16)) SkPM4f {
+    float fVec[4];
+
+    float a() const { return fVec[SK_A32_SHIFT/8]; }
+};
+
+/*
+ *  The float values are 0...1 unpremultiplied
+ */
+struct SkColor4f {
+    float fA;
+    float fR;
+    float fG;
+    float fB;
+
+    bool operator==(const SkColor4f& other) const {
+        return fA == other.fA && fR == other.fR && fG == other.fG && fB == other.fB;
+    }
+    bool operator!=(const SkColor4f& other) const {
+        return !(*this == other);
+    }
+
+    const float* vec() const { return &fA; }
+    float* vec() { return &fA; }
+
+    static SkColor4f Pin(float a, float r, float g, float b);
+    static SkColor4f FromColor(SkColor);
+
+    SkColor4f pin() const {
+        return Pin(fA, fR, fG, fB);
+    }
+
+    SkPM4f premul() const;
+};
+
 #endif