Make additional code paths go through GrDrawState helper classes for their matrix manipulations.

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615064

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

1 files changed, 22 insertions, 2 deletions

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 5dccb1581d..8e063f775e 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -483,6 +483,9 @@ public:
 
         ~AutoViewMatrixRestore() { this->restore(); }
 
+        /**
+         * Can be called prior to destructor to restore the original matrix.
+         */
         void restore();
         
         void set(GrDrawState* drawState,
@@ -520,13 +523,30 @@ public:
             this->set(drawState, explicitCoordStageMask);
         }
 
+        ~AutoDeviceCoordDraw() { this->restore(); }
+
         bool set(GrDrawState* drawState, uint32_t explicitCoordStageMask = 0);
 
+        /**
+         * Returns true if this object was successfully initialized on to a GrDrawState. It may
+         * return false because a non-default constructor or set() were never called or because
+         * the view matrix was not invertible.
+         */
         bool succeeded() const { return NULL != fDrawState; }
 
-        void restore();
+        /**
+         * Returns the matrix that was set previously set on the drawState. This is only valid
+         * if succeeded returns true.
+         */
+        const GrMatrix& getOriginalMatrix() const {
+            GrAssert(this->succeeded());
+            return fViewMatrix;
+        }
 
-        ~AutoDeviceCoordDraw() { this->restore(); }
+        /**
+         * Can be called prior to destructor to restore the original matrix.
+         */
+        void restore();
 
     private:
         GrDrawState*       fDrawState;