Remove deferred version of GrDrawState.

src/gpu/GrInOrderDrawBuffer.h

Index: src/gpu/GrInOrderDrawBuffer.h
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index b31a9957d1a262b11fb0a055dffe35fe7ffbc151..3025c067f7a244119d7a0a785bf6034c71cb4484 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -232,7 +232,7 @@ private:
     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;
@@ -241,7 +241,7 @@ private:
     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;