Remove use of GrEffectRef from draw state and below.

include/gpu/GrEffectStage.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 27 matching lines @@
         }
         fEffectRef.reset(SkRef(other.fEffectRef.get()));
         memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
         return *this;
     }
 
     bool operator== (const GrEffectStage& other) const {
         SkASSERT(NULL != fEffectRef.get());
         SkASSERT(NULL != other.fEffectRef.get());
 
-        if (!(*this->getEffect())->isEqual(*other.getEffect())) {
+        if (!this->getEffect()->isEqual(*other.getEffect())) {
             return false;
         }
 
         if (fCoordChangeMatrixSet != other.fCoordChangeMatrixSet) {
             return false;
         }
 
         if (!fCoordChangeMatrixSet) {
             return true;
         }
@@ skipping 60 matching lines @@
      * installed in the stage.
      */
     const SkMatrix& getCoordChangeMatrix() const {
         if (fCoordChangeMatrixSet) {
             return fCoordChangeMatrix;
         } else {
             return SkMatrix::I();
         }
     }
 
-    const GrEffectRef* getEffect() const { return fEffectRef.get(); }
+    const GrEffect* getEffect() const { return fEffectRef.get()->get(); }
 
     const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
     int getVertexAttribIndexCount() const { return fEffectRef->get()->numVertexAttribs(); }
 
 private:
     bool                                fCoordChangeMatrixSet;
     SkMatrix                            fCoordChangeMatrix;
     SkAutoTUnref<const GrEffectRef>     fEffectRef;
     int                                 fVertexAttribIndices[2];
 };
 
 #endif