remove mutable apis on SkColorMatrixFilter, must use constructor.

fix flattening to not write function-ptrs (no go for serialization), so we
store the raw float values now.

Slight change to GM/DRT images for GPU possible. Just rebaseline.
Review URL: https://codereview.appspot.com/6273052

git-svn-id: http://skia.googlecode.com/svn/trunk@4143 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 2 insertions, 5 deletions

diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 1ac6fbf3ee..07bd967ed5 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -15,13 +15,9 @@
 
 class SK_API SkColorMatrixFilter : public SkColorFilter {
 public:
-    SkColorMatrixFilter();
     explicit SkColorMatrixFilter(const SkColorMatrix&);
     SkColorMatrixFilter(const SkScalar array[20]);
 
-    void setMatrix(const SkColorMatrix&);
-    void setArray(const SkScalar array[20]);
-
     // overrides from SkColorFilter
     virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) SK_OVERRIDE;
     virtual void filterSpan16(const uint16_t src[], int count, uint16_t[]) SK_OVERRIDE;
@@ -41,6 +37,7 @@ protected:
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
 private:
+    SkColorMatrix fMatrix;
 
     typedef void (*Proc)(State*, unsigned r, unsigned g, unsigned b,
                          unsigned a);
@@ -49,7 +46,7 @@ private:
     State       fState;
     uint32_t    fFlags;
 
-    void setup(const SkScalar array[20]);
+    void initState(const SkScalar array[20]);
 
     typedef SkColorFilter INHERITED;
 };