removing GrDrawEffect

include/gpu/GrBackendEffectFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBackendEffectFactory_DEFINED
 #define GrBackendEffectFactory_DEFINED
 
 #include "GrTypes.h"
 #include "SkTemplates.h"
 #include "SkThread.h"
 #include "SkTypes.h"
 #include "SkTArray.h"
 
 class GrGLEffect;
 class GrGLCaps;
-class GrDrawEffect;
+class GrEffect;
 
 /**
  * Used by effects to build their keys. It incorporates each per-effect key into a larger shader key.
  */
 class GrEffectKeyBuilder {
 public:
     GrEffectKeyBuilder(SkTArray<unsigned char, true>* data) : fData(data), fCount(0) {
         SkASSERT(0 == fData->count() % sizeof(uint32_t));
     }
 
@@ skipping 59 matching lines @@
  *
  * Using GrTBackendEffectFactory places a few constraints on the effect. See that class's comments.
  */
 class GrBackendEffectFactory : SkNoncopyable {
 public:
     /** 
      * Generates an effect's key. The key is based on the aspects of the GrEffect object's
      * configuration that affect GLSL code generation. Two GrEffect instances that would cause
      * this->createGLInstance()->emitCode() to produce different code must produce different keys.
      */
-    virtual void getGLEffectKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) const = 0;
+    virtual void getGLEffectKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*) const = 0;
 
     /**
      * Creates a GrGLEffect instance that is used both to generate code for the GrEffect in a GLSL
      * program and to manage updating uniforms for the program when it is used.
      */
-    virtual GrGLEffect* createGLInstance(const GrDrawEffect&) const = 0;
+    virtual GrGLEffect* createGLInstance(const GrEffect&) const = 0;
 
     /**
      * Produces a human-reable name for the effect.
      */
     virtual const char* name() const = 0;
 
     /**
      * A unique value for every instance of this factory. It is automatically incorporated into the
      * effect's key. This allows keys generated by getGLEffectKey() to only be unique within a
      * GrEffect subclass and not necessarily across subclasses.
@@ skipping 19 matching lines @@
                    "subclass.");
         }
         return id;
     }
 
     const uint32_t fEffectClassID;
     static int32_t fCurrEffectClassID;
 };
 
 #endif