Simplify GrDrawBatch uploads and token uage.

src/gpu/GrDefaultGeoProcFactory.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDefaultGeoProcFactory_DEFINED
 #define GrDefaultGeoProcFactory_DEFINED
 
 #include "GrGeometryProcessor.h"
 
-class GrDrawState;
-
 /*
  * A factory for creating default Geometry Processors which simply multiply position by the uniform
  * view matrix and wire through color, coverage, UV coords if requested.  Right now this is only
  * used in the creation of optimized draw states because adding default GPs to the drawstate can
  * interfere with batching due to updating the drawstate.
  */
 namespace GrDefaultGeoProcFactory {
     // Structs for adding vertex attributes
     struct PositionAttr {
         SkPoint fPosition;
@@ skipping 104 matching lines @@
      */
     const GrGeometryProcessor* CreateForDeviceSpace(const Color&,
                                                     const Coverage&,
                                                     const LocalCoords&,
                                                     const SkMatrix& viewMatrix);
 
     inline size_t DefaultVertexStride() { return sizeof(PositionAttr); }
 };
 
 #endif