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

include/core/SkXfermode.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 SkXfermode_DEFINED
 #define SkXfermode_DEFINED
 
 #include "SkFlattenable.h"
 #include "SkColor.h"
 
-class GrEffectRef;
+class GrEffect;
 class GrTexture;
 class SkString;
 
 /** \class SkXfermode
  *
  *  SkXfermode is the base class for objects that are called to implement custom
  *  "transfer-modes" in the drawing pipeline. The static function Create(Modes)
  *  can be called to return an instance of any of the predefined subclasses as
  *  specified in the Modes enum. When an SkXfermode is assigned to an SkPaint,
  *  then objects drawn with that paint have the xfermode applied.
@@ skipping 164 matching lines @@
 
     /** A subclass may implement this factory function to work with the GPU backend. It is legal
         to call this with all params NULL to simply test the return value. If effect is non-NULL
         then the xfermode may optionally allocate an effect to return and the caller as *effect.
         The caller will install it and own a ref to it. Since the xfermode may or may not assign
         *effect, the caller should set *effect to NULL beforehand. background specifies the
         texture to use as the background for compositing, and should be accessed in the effect's
         fragment shader. If NULL, the effect should request access to destination color
         (setWillReadDstColor()), and use that in the fragment shader (builder->dstColor()).
      */
-    virtual bool asNewEffect(GrEffectRef** effect, GrTexture* background = NULL) const;
+    virtual bool asNewEffect(GrEffect** effect, GrTexture* background = NULL) const;
 
     /** Returns true if the xfermode can be expressed as coeffs (src, dst), or as an effect
         (effect). This helper calls the asCoeff() and asNewEffect() virtuals. If the xfermode is
         NULL, it is treated as kSrcOver_Mode. It is legal to call this with all params NULL to
         simply test the return value.  effect, src, and dst must all be NULL or all non-NULL.
      */
     static bool AsNewEffectOrCoeff(SkXfermode*,
-                                   GrEffectRef** effect,
+                                   GrEffect** effect,
                                    Coeff* src,
                                    Coeff* dst,
                                    GrTexture* background = NULL);
 
     SK_TO_STRING_PUREVIRT()
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
     SK_DEFINE_FLATTENABLE_TYPE(SkXfermode)
 
 protected:
     SkXfermode() {}
@@ skipping 11 matching lines @@
 
 private:
     enum {
         kModeCount = kLastMode + 1
     };
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif