Revert of Make setVertexAttribs in GrDrawState take a stride parameter.

src/gpu/GrRODrawState.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrRODrawState_DEFINED
 #define GrRODrawState_DEFINED
 
@@ skipping 19 matching lines @@
     /// @name Vertex Attributes
     ////
 
     enum {
         kMaxVertexAttribCnt = kLast_GrVertexAttribBinding + 4,
     };
 
     const GrVertexAttrib* getVertexAttribs() const { return fVAPtr; }
     int getVertexAttribCount() const { return fVACount; }
 
-    size_t getVertexStride() const { return fVAStride; }
+    size_t getVertexSize() const { return fVertexSize; }
 
     /**
      * Getters for index into getVertexAttribs() for particular bindings. -1 is returned if the
      * binding does not appear in the current attribs. These bindings should appear only once in
      * the attrib array.
      */
 
     int positionAttributeIndex() const {
         return fFixedFunctionVertexAttribIndices[kPosition_GrVertexAttribBinding];
     }
@@ skipping 282 matching lines @@
         /** The GrDrawStates cannot be combined. */
         kIncompatible_CombinedState,
         /** Either draw state can be used in place of the other. */
         kAOrB_CombinedState,
         /** Use the first draw state. */
         kA_CombinedState,
         /** Use the second draw state. */
         kB_CombinedState,
     };
 
+    GrRODrawState& operator= (const GrRODrawState& that);
+
 protected:
     bool isEqual(const GrRODrawState& that) const;
 
     // These fields are roughly sorted by decreasing likelihood of being different in op==
     SkAutoTUnref<GrRenderTarget>        fRenderTarget;
     GrColor                             fColor;
     SkMatrix                            fViewMatrix;
     GrColor                             fBlendConstant;
     uint32_t                            fFlagBits;
     const GrVertexAttrib*               fVAPtr;
     int                                 fVACount;
-    size_t                              fVAStride;
+    size_t                              fVertexSize;
     GrStencilSettings                   fStencilSettings;
     uint8_t                             fCoverage;
     DrawFace                            fDrawFace;
     GrBlendCoeff                        fSrcBlend;
     GrBlendCoeff                        fDstBlend;
 
     typedef SkSTArray<4, GrEffectStage> EffectStageArray;
     EffectStageArray                    fColorStages;
     EffectStageArray                    fCoverageStages;
 
     mutable GrBlendCoeff                fOptSrcBlend;
     mutable GrBlendCoeff                fOptDstBlend;
     mutable BlendOptFlags               fBlendOptFlags;
 
     // This is simply a different representation of info in fVertexAttribs and thus does
     // not need to be compared in op==.
     int fFixedFunctionVertexAttribIndices[kGrFixedFunctionVertexAttribBindingCnt];
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrRODrawState::BlendOptFlags);
 
 #endif