Move ViewMatrix off of drawstate

src/gpu/GrGeometryProcessor.cpp

Index: src/gpu/GrGeometryProcessor.cpp
diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index d47f687d8970164f68ebf7629a011b9797a07c4d..01ea85a78b30d7db42124af5029727a9b474eb3a 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -119,8 +119,10 @@ private:
     typedef GrGLGeometryProcessor INHERITED;
 };
 
-GrPathProcessor::GrPathProcessor(GrColor color, const SkMatrix& localMatrix)
-    : INHERITED(localMatrix)
+GrPathProcessor::GrPathProcessor(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkMatrix& localMatrix)
+    : INHERITED(viewMatrix, localMatrix)
     , fColor(color) {
     this->initClassID<GrPathProcessor>();
 }
@@ -155,6 +157,10 @@ bool GrPathProcessor::canMakeEqual(const GrBatchTracker& m,
         return false;
     }
 
+    if (!this->viewMatrix().cheapEqualTo(that.viewMatrix())) {
+        return false;
+    }
+
     const PathBatchTracker& mine = m.cast<PathBatchTracker>();
     const PathBatchTracker& theirs = t.cast<PathBatchTracker>();
     return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords,