More changes to bring together path / geo procs

src/gpu/gl/GrGLGeometryProcessor.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 GrGLGeometryProcessor_DEFINED
 #define GrGLGeometryProcessor_DEFINED
 
@@ skipping 63 matching lines @@
 
 protected:
     /** 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 GrGeometryProcessor::GrAttribute* colorAttr,
+                               const GrGeometryProcessor::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 102 matching lines @@
     virtual void didSetData(GrGLPathRendering*) {}
 
 private:
     UniformHandle fColorUniform;
     GrColor fColor;
 
     typedef GrGLPrimitiveProcessor INHERITED;
 };
 
 #endif