Revert of Preliminary attempt to remove batch tracker

src/gpu/gl/GrGLPrimitiveProcessor.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLPrimitiveProcessor_DEFINED
 #define GrGLPrimitiveProcessor_DEFINED
 
@@ skipping 56 matching lines @@
         GrPrimitiveProcessor parameter is guaranteed to be of the same type that created this
         GrGLPrimitiveProcessor and to have an identical processor key as the one that created this
         GrGLPrimitiveProcessor.  */
     virtual void setData(const GrGLProgramDataManager&,
                          const GrPrimitiveProcessor&,
                          const GrBatchTracker&) = 0;
 
     static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&);
 
 protected:
-    void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform);
+    /** a helper which can setup vertex, constant, or uniform color depending on inputType.
+     *  This function will only do the minimum required to emit the correct shader code.  If
+     *  inputType == attribute, then colorAttr must not be NULL.  Likewise, if inputType == Uniform
+     *  then colorUniform must not be NULL.
+     */
+    void setupColorPassThrough(GrGLGPBuilder* pb,
+                               GrGPInput inputType,
+                               const char* inputName,
+                               const GrPrimitiveProcessor::Attribute* colorAttr,
+                               UniformHandle* colorUniform);
 
     const char* uViewM() const { return fViewMatrixName; }
 
     /** a helper function to setup the uniform handle for the uniform view matrix */
     void addUniformViewMatrix(GrGLGPBuilder*);
 
 
     /** a helper function to upload a uniform viewmatrix.
      * TODO we can remove this function when we have deferred geometry in place
      */
@@ skipping 24 matching lines @@
 
     SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms;
 
 private:
     UniformHandle fViewMatrixUniform;
     SkMatrix fViewMatrix;
     const char* fViewMatrixName;
 };
 
 #endif