diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 45ef699..7638067 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -467,7 +467,7 @@
     if (vm.invert(&ivm)) {
         drawState->preConcatSamplerMatrices(stageMask, ivm);
     }
-    drawState->setViewMatrix(GrMatrix::I());
+    drawState->viewMatrix()->reset();
 
     GrVertexLayout layout = 0;
     for (int s = 0; s < GrDrawState::kNumStages; ++s) {
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index f24ce7b..3e5a1fa 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -618,7 +618,7 @@
         if (drawState->getViewInverse(&ivm)) {
             drawState->preConcatSamplerMatrices(stageMask, ivm);
         }
-        drawState->setViewMatrix(GrMatrix::I());
+        drawState->viewMatrix()->reset();
     }
 
     // TODO: See whether rendering lines as degenerate quads improves perf
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 7130bb5..791dc68 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -488,7 +488,7 @@
                         }
                         drawState->preConcatSamplerMatrices(stageMask, vmi);
                     }
-                    drawState->setViewMatrix(GrMatrix::I());
+                    drawState->viewMatrix()->reset();
                 }
             } else {
                 bounds = path.getBounds();
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 3dd86d2..e9b7e49 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -1152,7 +1152,7 @@
             fStageMask = 0;
         }
     }
-    drawState->setViewMatrix(GrMatrix::I());
+    drawState->viewMatrix()->reset();
 }
 
 GrDrawTarget::AutoDeviceCoordDraw::~AutoDeviceCoordDraw() {
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 32338ca..10c5c44 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -594,7 +594,7 @@
             AutoStateRestore asr(this);
             AutoGeometryPush agp(this);
 
-            drawState->setViewMatrix(GrMatrix::I());
+            drawState->viewMatrix()->reset();
             this->flushScissor(NULL);
 #if !VISUALIZE_COMPLEX_CLIP
             drawState->enableState(GrDrawState::kNoColorWrites_StateBit);