Revert "Revert of impl colormatrix w/ floats (patchset #7 id:120001 of https://codereview.chromium.…

include/effects/SkColorMatrix.h

 /*
  * Copyright 2007 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 SkColorMatrix_DEFINED
 #define SkColorMatrix_DEFINED
 
 #include "SkScalar.h"
 
 class SK_API SkColorMatrix {
 public:
-    SkScalar    fMat[20];
+    enum {
+        kCount = 20
+    };
+    SkScalar    fMat[kCount];
 
     enum Elem {
         kR_Scale    = 0,
         kG_Scale    = 6,
         kB_Scale    = 12,
         kA_Scale    = 18,
 
         kR_Trans    = 4,
         kG_Trans    = 9,
         kB_Trans    = 14,
@@ skipping 32 matching lines @@
         return 0 == memcmp(fMat, other.fMat, sizeof(fMat));
     }
 
     bool operator!=(const SkColorMatrix& other) const { return !((*this) == other); }
 
     static bool NeedsClamping(const SkScalar[20]);
     static void SetConcat(SkScalar result[20], const SkScalar outer[20], const SkScalar inner[20]);
 };
 
 #endif