Make sure attribute indexes are correct after restoring vertex attributes

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 142 matching lines @@
      public:
          AutoVertexAttribRestore(GrDrawState* drawState) {
              SkASSERT(NULL != drawState);
              fDrawState = drawState;
              fVAPtr = drawState->fCommon.fVAPtr;
              fVACount = drawState->fCommon.fVACount;
              fDrawState->setDefaultVertexAttribs();
          }
 
          ~AutoVertexAttribRestore(){
-             fDrawState->fCommon.fVAPtr = fVAPtr;
-             fDrawState->fCommon.fVACount = fVACount;
+             fDrawState->setVertexAttribs(fVAPtr, fVACount);
          }
 
      private:
          GrDrawState*          fDrawState;
          const GrVertexAttrib* fVAPtr;
          int                   fVACount;
      };
 
     /**
      * Accessing positions, local coords, or colors, of a vertex within an array is a hassle
@@ skipping 901 matching lines @@
      *  @param count      the number of attributes being set, limited to kMaxVertexAttribCnt.
      */
     void setVertexAttribs(const GrVertexAttrib attribs[], int count);
 
     typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
 
 #endif