Remove deferred version of GrDrawState.

src/gpu/GrInOrderDrawBuffer.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 GrInOrderDrawBuffer_DEFINED
 #define GrInOrderDrawBuffer_DEFINED
 
@@ skipping 214 matching lines @@
         kClipPreallocCnt         = 8,
         kClearPreallocCnt        = 8,
         kGeoPoolStatePreAllocCnt = 4,
         kCopySurfacePreallocCnt  = 4,
     };
 
     typedef GrTAllocator<DrawRecord>                        DrawAllocator;
     typedef GrTAllocator<StencilPath>                       StencilPathAllocator;
     typedef GrTAllocator<DrawPath>                          DrawPathAllocator;
     typedef GrTAllocator<DrawPaths>                         DrawPathsAllocator;
-    typedef GrTAllocator<GrDrawState::DeferredState>        StateAllocator;
+    typedef GrTAllocator<GrDrawState>                       StateAllocator;
     typedef GrTAllocator<Clear>                             ClearAllocator;
     typedef GrTAllocator<CopySurface>                       CopySurfaceAllocator;
     typedef GrTAllocator<Clip>                              ClipAllocator;
 
     GrSTAllocator<kDrawPreallocCnt, DrawRecord>                        fDraws;
     GrSTAllocator<kStencilPathPreallocCnt, StencilPath>                fStencilPaths;
     GrSTAllocator<kDrawPathPreallocCnt, DrawPath>                      fDrawPath;
     GrSTAllocator<kDrawPathsPreallocCnt, DrawPaths>                    fDrawPaths;
-    GrSTAllocator<kStatePreallocCnt, GrDrawState::DeferredState>       fStates;
+    GrSTAllocator<kStatePreallocCnt, GrDrawState>                      fStates;
     GrSTAllocator<kClearPreallocCnt, Clear>                            fClears;
     GrSTAllocator<kCopySurfacePreallocCnt, CopySurface>                fCopySurfaces;
     GrSTAllocator<kClipPreallocCnt, Clip>                              fClips;
 
     SkTArray<GrTraceMarkerSet, false>                                  fGpuCmdMarkers;
 
     SkSTArray<kCmdPreallocCnt, uint8_t, true>                          fCmds;
 
     GrDrawTarget*                   fDstGpu;
 
@@ skipping 28 matching lines @@
 
     void addToCmdBuffer(uint8_t cmd);
 
     bool                            fFlushing;
     uint32_t                        fDrawID;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif