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

include/core/SkShader.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 SkShader_DEFINED
 #define SkShader_DEFINED
 
 #include "SkBitmap.h"
 #include "SkFlattenable.h"
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "../gpu/GrColor.h"
 
 class SkPath;
 class SkPicture;
 class SkXfermode;
 class GrContext;
-class GrEffectRef;
+class GrEffect;
 
 /** \class SkShader
  *
  *  Shaders specify the source color(s) for what is being drawn. If a paint
  *  has no shader, then the paint's color is used. If the paint has a
  *  shader, then the shader's color(s) are use instead, but they are
  *  modulated by the paint's alpha. This makes it easy to create a shader
  *  once (e.g. bitmap tiling or gradient) and then change its transparency
  *  w/o having to modify the original shader... only the paint's alpha needs
  *  to be modified.
@@ skipping 343 matching lines @@
      *  Returns true if the shader subclass succeeds in setting the grEffect and the grColor output 
      *  parameters to a value, returns false if it fails or if there is not an implementation of
      *  this method in the shader subclass.
      *  The incoming color to the effect has r=g=b=a all extracted from the SkPaint's alpha.
      *  The output color should be the computed SkShader premul color modulated by the incoming
      *  color. The GrContext may be used by the effect to create textures. The GPU device does not
      *  call createContext. Instead we pass the SkPaint here in case the shader needs paint info.
      */
     virtual bool asNewEffect(GrContext* context, const SkPaint& paint,
                              const SkMatrix* localMatrixOrNull, GrColor* grColor,
-                             GrEffectRef** grEffect) const;
+                             GrEffect** grEffect) const;
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     /**
      *  If the shader is a custom shader which has data the caller might want, call this function
      *  to get that data.
      */
     virtual bool asACustomShader(void** customData) const { return false; }
 #endif
 
     //////////////////////////////////////////////////////////////////////////
@@ skipping 67 matching lines @@
      */
     virtual Context* onCreateContext(const ContextRec&, void* storage) const;
 
 private:
     SkMatrix fLocalMatrix;
     
     typedef SkFlattenable INHERITED;
 };
 
 #endif