commit 0f11e1ab5b6e53f6176dde2dbb25a8e3ae34858f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 08 14:48:36 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 08 14:48:36 2012 +0000
tree e1ede971e62f13815c6afa4f7e233b29cabe69e7
parent a5b7cc00b9e95c4c6c02b5bd26aba5e6401f7fd7

Remove translate param from GrContext::drawPath (and subsequent calls).
Review URL: https://codereview.appspot.com/6615062

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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 7e0c915..ef59ca5 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1019,7 +1019,7 @@
         path.addOval(rect);
         GrPathFill fill = (strokeWidth == 0) ?
                            kHairLine_GrPathFill : kWinding_GrPathFill;
-        this->internalDrawPath(paint, path, fill, NULL);
+        this->internalDrawPath(paint, path, fill);
         return;
     }
 
@@ -1091,8 +1091,7 @@
     target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
 }
 
-void GrContext::drawPath(const GrPaint& paint, const SkPath& path,
-                         GrPathFill fill, const GrPoint* translate) {
+void GrContext::drawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill) {
 
     if (path.isEmpty()) {
        if (GrIsFillInverted(fill)) {
@@ -1103,19 +1102,15 @@
 
     SkRect ovalRect;
     if (!GrIsFillInverted(fill) && path.isOval(&ovalRect)) {
-        if (translate) {
-            ovalRect.offset(*translate);
-        }
         SkScalar width = (fill == kHairLine_GrPathFill) ? 0 : -SK_Scalar1;
         this->drawOval(paint, ovalRect, width);
         return;
     }
 
-    internalDrawPath(paint, path, fill, translate);
+    this->internalDrawPath(paint, path, fill);
 }
 
-void GrContext::internalDrawPath(const GrPaint& paint, const SkPath& path,
-                                 GrPathFill fill, const GrPoint* translate) {
+void GrContext::internalDrawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill) {
 
     // Note that below we may sw-rasterize the path into a scratch texture.
     // Scratch textures can be recycled after they are returned to the texture
@@ -1146,7 +1141,7 @@
         return;
     }
 
-    pr->drawPath(path, fill, translate, target, prAA);
+    pr->drawPath(path, fill, target, prAA);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1672,6 +1667,10 @@
     fDrawState->setViewMatrix(m);
 }
 
+void GrContext::setIdentityMatrix() {
+    fDrawState->viewMatrix()->reset();
+}
+
 void GrContext::concatMatrix(const GrMatrix& m) const {
     fDrawState->preConcatViewMatrix(m);
 }