commit b9086a026844e4cfd08b219e49ce3f12294cba98
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 18:02:54 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 18:02:54 2012 +0000
tree 1f97e490ba203d8717d70a5cae5571efef8a495b
parent db2e25a7d45d8a63ed87af96e5d1bf7577ff48fe

Replace GrMatrix with SkMatrix.
Review URL: https://codereview.appspot.com/6814067

git-svn-id: http://skia.googlecode.com/svn/trunk@6247 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index ff1296a..911b5e4 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -72,7 +72,7 @@
     fFShaderID = 0;
     fProgramID = 0;
 
-    fViewMatrix = GrMatrix::InvalidMatrix();
+    fViewMatrix = SkMatrix::InvalidMatrix();
     fViewportSize.set(-1, -1);
     fColor = GrColor_ILLEGAL;
     fColorFilterColor = GrColor_ILLEGAL;
@@ -80,7 +80,7 @@
 
     for (int s = 0; s < GrDrawState::kNumStages; ++s) {
         fEffects[s] = NULL;
-        fTextureMatrices[s] = GrMatrix::InvalidMatrix();
+        fTextureMatrices[s] = SkMatrix::InvalidMatrix();
         // this is arbitrary, just initialize to something
         fTextureOrigin[s] = GrSurface::kBottomLeft_Origin;
     }