Drawstate on stack

src/gpu/GrAARectRenderer.h

Index: src/gpu/GrAARectRenderer.h
diff --git a/src/gpu/GrAARectRenderer.h b/src/gpu/GrAARectRenderer.h
index e39b87a5fd3305103497ba83a346373b881f530f..a8ba0851082d938a77a234b726552c4c3b9bc4ee 100644
--- a/src/gpu/GrAARectRenderer.h
+++ b/src/gpu/GrAARectRenderer.h
@@ -14,6 +14,7 @@
 #include "SkStrokeRec.h"
 
 class GrGpu;
+class GrDrawState;
 class GrDrawTarget;
 class GrIndexBuffer;
 
@@ -41,32 +42,37 @@ public:
     // between them by passing in stroke (==NULL means fill).
 
     void fillAARect(GrDrawTarget* target,
+                    GrDrawState* ds,
                     const SkRect& rect,
                     const SkMatrix& combinedMatrix,
                     const SkRect& devRect) {
-        this->geometryFillAARect(target, rect, combinedMatrix, devRect);
+        this->geometryFillAARect(target, ds, rect, combinedMatrix, devRect);
     }
 
-    void strokeAARect(GrDrawTarget* target,
+    void strokeAARect(GrDrawTarget*,
+                      GrDrawState*,
                       const SkRect& rect,
                       const SkMatrix& combinedMatrix,
                       const SkRect& devRect,
                       const SkStrokeRec& stroke);
 
     // First rect is outer; second rect is inner
-    void fillAANestedRects(GrDrawTarget* target,
+    void fillAANestedRects(GrDrawTarget*,
+                           GrDrawState*,
                            const SkRect rects[2],
                            const SkMatrix& combinedMatrix);
 
 private:
     GrIndexBuffer* aaStrokeRectIndexBuffer(bool miterStroke);
 
-    void geometryFillAARect(GrDrawTarget* target,
+    void geometryFillAARect(GrDrawTarget*,
+                            GrDrawState*,
                             const SkRect& rect,
                             const SkMatrix& combinedMatrix,
                             const SkRect& devRect);
 
-    void geometryStrokeAARect(GrDrawTarget* target,
+    void geometryStrokeAARect(GrDrawTarget*,
+                              GrDrawState*,
                               const SkRect& devOutside,
                               const SkRect& devOutsideAssist,
                               const SkRect& devInside,