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/GrAAConvexPathRenderer.cpp

diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 3f4db39..4ac6163 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -200,7 +200,7 @@
     }
 }
 
-inline bool get_direction(const SkPath& path, const GrMatrix& m, SkPath::Direction* dir) {
+inline bool get_direction(const SkPath& path, const SkMatrix& m, SkPath::Direction* dir) {
     if (!path.cheapComputeDirection(dir)) {
         return false;
     }
@@ -217,7 +217,7 @@
 }
 
 bool get_segments(const SkPath& path,
-                  const GrMatrix& m,
+                  const SkMatrix& m,
                   SegmentArray* segments,
                   SkPoint* fanPt,
                   int* vCount,
@@ -458,7 +458,7 @@
     if (!adcd.succeeded()) {
         return false;
     }
-    const GrMatrix* vm = &adcd.getOriginalMatrix();
+    const SkMatrix* vm = &adcd.getOriginalMatrix();
 
     GrVertexLayout layout = 0;
     layout |= GrDrawTarget::kEdge_VertexLayoutBit;
@@ -470,7 +470,7 @@
     if (vm->hasPerspective()) {
         origPath.transform(*vm, &tmpPath);
         path = &tmpPath;
-        vm = &GrMatrix::I();
+        vm = &SkMatrix::I();
     }
 
     QuadVertex *verts;