Revert of create and thread batch tracker object

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 50 matching lines @@
  *
  * const GrBackendProcessorFactory& MyProcessor::getFactory() const {
  *     return GrTBackendProcessorFactory<MyProcessor>::getInstance();
  * }
  *
  * Using GrTBackendProcessorFactory places a few constraints on the processor. See that class's
  * comments.
  */
 class GrBackendProcessorFactory : SkNoncopyable {
 public:
+    /** 
+     * Generates an processor's key. The key is based on the aspects of the GrProcessor object's
+     * configuration that affect GLSL code generation. Two GrProcessor instances that would cause
+     * this->createGLInstance()->emitCode() to produce different code must produce different keys.
+     */
+    virtual void getGLProcessorKey(const GrProcessor&, const GrGLCaps&,
+                                   GrProcessorKeyBuilder*) const = 0;
+
     /**
      * 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.
      */
@@ skipping 32 matching lines @@
 class GrGLXferProcessor;
 
 /**
  * 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
  */
 
 class GrBackendFragmentProcessorFactory : public GrBackendProcessorFactory {
 public:
     /**
-     * Generates an processor's key. The key is based on the aspects of the GrProcessor object's
-     * configuration that affect GLSL code generation. Two GrProcessor instances that would cause
-     * this->createGLInstance()->emitCode() to produce different code must produce different keys.
-     */
-    virtual void getGLProcessorKey(const GrFragmentProcessor&,
-                                   const GrGLCaps&,
-                                   GrProcessorKeyBuilder*) const = 0;
-
-    /**
      * 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 GrGLFragmentProcessor* createGLInstance(const GrFragmentProcessor&) const = 0;
 };
 
 class GrBackendXferProcessorFactory : 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 GrGLXferProcessor* createGLInstance(const GrXferProcessor&) const = 0;
 };
 
-class GrBatchTracker;
-
 class GrBackendGeometryProcessorFactory : public GrBackendProcessorFactory {
 public:
     /**
-     * Generates an processor's key. The key is based on the aspects of the GrProcessor object's
-     * configuration that affect GLSL code generation. Two GrProcessor instances that would cause
-     * this->createGLInstance()->emitCode() to produce different code must produce different keys.
-     */
-    virtual void getGLProcessorKey(const GrGeometryProcessor&,
-                                   const GrBatchTracker&,
-                                   const GrGLCaps&,
-                                   GrProcessorKeyBuilder*) const = 0;
-
-    /**
      * 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 GrBatchTracker&) const = 0;
+    virtual GrGLGeometryProcessor* createGLInstance(const GrGeometryProcessor&) const = 0;
 };
 
 #endif