Move ViewMatrix off of drawstate

src/gpu/GrAARectRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAARectRenderer_DEFINED
 #define GrAARectRenderer_DEFINED
 
@@ skipping 27 matching lines @@
     ~GrAARectRenderer() {
         this->reset();
     }
 
     // TODO: potentialy fuse the fill & stroke methods and differentiate
     // between them by passing in stroke (==NULL means fill).
 
     void fillAARect(GrDrawTarget* target,
                     GrDrawState* ds,
                     GrColor color,
+                    const SkMatrix& viewMatrix,
                     const SkMatrix& localMatrix,
                     const SkRect& rect,
-                    const SkMatrix& combinedMatrix,
                     const SkRect& devRect) {
-        this->geometryFillAARect(target, ds, color, localMatrix, rect, combinedMatrix, devRect);
+        this->geometryFillAARect(target, ds, color, viewMatrix, localMatrix, rect, devRect);
     }
 
     void strokeAARect(GrDrawTarget*,
                       GrDrawState*,
                       GrColor,
+                      const SkMatrix& viewMatrix,
                       const SkMatrix& localMatrix,
                       const SkRect& rect,
-                      const SkMatrix& combinedMatrix,
                       const SkRect& devRect,
                       const SkStrokeRec& stroke);
 
     // First rect is outer; second rect is inner
     void fillAANestedRects(GrDrawTarget*,
                            GrDrawState*,
                            GrColor,
+                           const SkMatrix& viewMatrix,
                            const SkMatrix& localMatrix,
-                           const SkRect rects[2],
-                           const SkMatrix& combinedMatrix);
+                           const SkRect rects[2]);
 
 private:
     GrIndexBuffer* aaStrokeRectIndexBuffer(bool miterStroke);
 
     void geometryFillAARect(GrDrawTarget*,
                             GrDrawState*,
                             GrColor,
+                            const SkMatrix& viewMatrix,
                             const SkMatrix& localMatrix,
                             const SkRect& rect,
-                            const SkMatrix& combinedMatrix,
                             const SkRect& devRect);
 
     void geometryStrokeAARect(GrDrawTarget*,
                               GrDrawState*,
                               GrColor,
                               const SkMatrix& localMatrix,
                               const SkRect& devOutside,
                               const SkRect& devOutsideAssist,
                               const SkRect& devInside,
                               bool miterStroke);
 
     GrGpu*                      fGpu;
     GrIndexBuffer*              fAAFillRectIndexBuffer;
     GrIndexBuffer*              fAAMiterStrokeRectIndexBuffer;
     GrIndexBuffer*              fAABevelStrokeRectIndexBuffer;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif // GrAARectRenderer_DEFINED