Combine clip stack and clip origin into one struct in GrIODB.

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 127 matching lines @@
         GrRenderTarget* fRenderTarget;
     };
 
     struct CopySurface : public ::SkNoncopyable {
         SkAutoTUnref<GrSurface> fDst;
         SkAutoTUnref<GrSurface> fSrc;
         SkIRect                 fSrcRect;
         SkIPoint                fDstPoint;
     };
 
+    struct Clip : public ::SkNoncopyable {
+        SkClipStack fStack;
+        SkIPoint    fOrigin;
+    };
+
     // overrides from GrDrawTarget
     virtual void onDraw(const DrawInfo&) SK_OVERRIDE;
     virtual void onDrawRect(const SkRect& rect,
                             const SkMatrix* matrix,
                             const SkRect* localRect,
                             const SkMatrix* localMatrix) SK_OVERRIDE;
 
     virtual void onStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
     virtual void onDrawPath(const GrPath*, SkPath::FillType,
                             const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
@@ skipping 65 matching lines @@
         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<Clear>                             ClearAllocator;
     typedef GrTAllocator<CopySurface>                       CopySurfaceAllocator;
-    typedef GrTAllocator<SkClipStack>                       ClipAllocator;
-    typedef GrTAllocator<SkIPoint>                          ClipOriginAllocator;
+    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<kClearPreallocCnt, Clear>                            fClears;
     GrSTAllocator<kCopySurfacePreallocCnt, CopySurface>                fCopySurfaces;
-    GrSTAllocator<kClipPreallocCnt, SkClipStack>                       fClips;
-    GrSTAllocator<kClipPreallocCnt, SkIPoint>                          fClipOrigins;
+    GrSTAllocator<kClipPreallocCnt, Clip>                              fClips;
 
     SkTArray<GrTraceMarkerSet, false>                                  fGpuCmdMarkers;
 
     SkSTArray<kCmdPreallocCnt, uint8_t, true>                          fCmds;
 
     GrDrawTarget*                   fDstGpu;
 
     bool                            fClipSet;
 
     enum ClipProxyState {
@@ skipping 25 matching lines @@
 
     void addToCmdBuffer(uint8_t cmd);
 
     bool                            fFlushing;
     uint32_t                        fDrawID;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif