Last round of effect->processor (for now)

include/gpu/GrBackendProcessorFactory.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 GrBackendProcessorFactory_DEFINED
 #define GrBackendProcessorFactory_DEFINED
 
@@ skipping 93 matching lines @@
     /**
      * Produces a human-reable name for the v.
      */
     virtual const char* name() const = 0;
 
     /**
      * A unique value for every instance of this factory. It is automatically incorporated into the
      * processor's key. This allows keys generated by getGLProcessorKey() to only be unique within a
      * GrProcessor subclass and not necessarily across subclasses.
      */
-    uint32_t effectClassID() const { return fEffectClassID; }
+    uint32_t classID() const { return fProcessorClassID; }
 
 protected:
-    GrBackendProcessorFactory() : fEffectClassID(GenID()) {}
+    GrBackendProcessorFactory() : fProcessorClassID(GenClassID()) {}
     virtual ~GrBackendProcessorFactory() {}
 
 private:
     enum {
-        kIllegalEffectClassID = 0,
+        kIllegalProcessorClassID = 0,
     };
 
-    static uint32_t GenID() {
-        // fCurrEffectClassID has been initialized to kIllegalEffectClassID. The
+    static uint32_t GenClassID() {
+        // fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The
         // atomic inc returns the old value not the incremented value. So we add
         // 1 to the returned value.
-        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(&fCurrEffectClassID)) + 1;
+        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(&fCurrProcessorClassID)) + 1;
         if (!id) {
             SkFAIL("This should never wrap as it should only be called once for each GrProcessor "
                    "subclass.");
         }
         return id;
     }
 
-    const uint32_t fEffectClassID;
-    static int32_t fCurrEffectClassID;
+    const uint32_t fProcessorClassID;
+    static int32_t fCurrProcessorClassID;
 };
 
 class GrFragmentProcessor;
 class GrGeometryProcessor;
 class GrGLFragmentProcessor;
 class GrGLGeometryProcessor;
 
 /**
  * Backend processor factory cannot actually create anything, it is up to subclasses to implement
  * a create binding which matches Gr to GL in a type safe way
@@ skipping 11 matching lines @@
 class GrBackendGeometryProcessorFactory : public GrBackendProcessorFactory {
 public:
     /**
      * Creates a GrGLProcessor instance that is used both to generate code for the GrProcessor in a
      * GLSL program and to manage updating uniforms for the program when it is used.
      */
     virtual GrGLGeometryProcessor* createGLInstance(const GrGeometryProcessor&) const = 0;
 };
 
 #endif