Move ViewMatrix off of drawstate

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
 
@@ skipping 62 matching lines @@
         kLastGPType = kCoverage_GPType
     };
 
     /*
      * The following functions are used to create default GPs.  If you just need to create
      * attributes seperately from creating the default GP, use the SetAttribs function followed
      * by the Create function.  Otherwise use CreateAndSetAttribs to do both at once.
      *
      * You must unref the return from Create.
      */
-    static const GrGeometryProcessor* Create(GrColor,
-                                             uint32_t gpTypeFlags = 0,
+    // TODO clean this up
+    static const GrGeometryProcessor* Create(uint32_t gpTypeFlags,
+                                             GrColor,
+                                             const SkMatrix& viewMatrix = SkMatrix::I(),
+                                             const SkMatrix& localMatrix = SkMatrix::I(),
                                              bool opaqueVertexColors = false,
-                                             uint8_t coverage = 0xff,
-                                             const SkMatrix& localMatrix = SkMatrix::I());
-
-    static const GrGeometryProcessor* Create(GrColor color,
-                                             uint32_t gpTypeFlags,
-                                             const SkMatrix& localMatrix) {
-        return Create(color, gpTypeFlags, false, 0xff, localMatrix);
-    }
+                                             uint8_t coverage = 0xff);
 
     static size_t DefaultVertexStride() { return sizeof(PositionAttr); }
 };
 
 #endif