Make drawRect preserve vertex attrib state and push/pop the geom sources.

src/gpu/GrDrawState.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawState_DEFINED
 #define GrDrawState_DEFINED
 
@@ skipping 152 matching lines @@
     bool hasColorVertexAttribute() const {
         return -1 != fCommon.fFixedFunctionVertexAttribIndices[kColor_GrVertexAttribBinding];
     }
     bool hasCoverageVertexAttribute() const {
         return -1 != fCommon.fFixedFunctionVertexAttribIndices[kCoverage_GrVertexAttribBinding];
     }
 
     bool validateVertexAttribs() const;
 
     /**
+     * Helper to save/restore vertex attribs
+     */
+     class AutoVertexAttribRestore {
+     public:
+         AutoVertexAttribRestore(GrDrawState* drawState) {
+             GrAssert(NULL != drawState);
+             fDrawState = drawState;
+             fVertexAttribs = drawState->fCommon.fVertexAttribs;
+             fDrawState->setDefaultVertexAttribs();
+         }
+
+         ~AutoVertexAttribRestore(){
+             fDrawState->fCommon.fVertexAttribs = fVertexAttribs;
+         }
+
+     private:
+         GrDrawState*                               fDrawState;
+         GrVertexAttribArray<kMaxVertexAttribCnt>   fVertexAttribs;
+     };
+
+    /**
      * Accessing positions, local coords, or colors, of a vertex within an array is a hassle
      * involving casts and simple math. These helpers exist to keep GrDrawTarget clients' code a bit
      * nicer looking.
      */
 
     /**
      * Gets a pointer to a GrPoint of a vertex's position or texture
      * coordinate.
      * @param vertices      the vertex array
      * @param vertexIndex   the index of the vertex in the array
@@ skipping 941 matching lines @@
     SkAutoTUnref<GrRenderTarget>           fRenderTarget;
     CommonState                            fCommon;
     GrEffectStage                          fStages[kNumStages];
 
     typedef GrRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
 
 #endif