Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.

include/effects/SkColorMatrixFilter.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 SkColorMatrixFilter_DEFINED
 #define SkColorMatrixFilter_DEFINED
 
 #include "SkColorFilter.h"
 #include "SkColorMatrix.h"
 
 class SK_API SkColorMatrixFilter : public SkColorFilter {
 public:
     static SkColorMatrixFilter* Create(const SkColorMatrix& cm) {
         return SkNEW_ARGS(SkColorMatrixFilter, (cm));
     }
     static SkColorMatrixFilter* Create(const SkScalar array[20]) {
         return SkNEW_ARGS(SkColorMatrixFilter, (array));
     }
 
     // overrides from SkColorFilter
     virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
     virtual void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE;
     virtual uint32_t getFlags() const SK_OVERRIDE;
     virtual bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE;
 #if SK_SUPPORT_GPU
-    virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE;
+    virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE;
 #endif
 
     struct State {
         int32_t fArray[20];
         int     fShift;
     };
 
     SK_TO_STRING_OVERRIDE()
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter)
@@ skipping 13 matching lines @@
     Proc        fProc;
     State       fState;
     uint32_t    fFlags;
 
     void initState(const SkScalar array[20]);
 
     typedef SkColorFilter INHERITED;
 };
 
 #endif