Move clip off of draw target

src/gpu/SkGpuDevice.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
@@ skipping 117 matching lines @@
     bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
     bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE;
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture,
                                           const SkMatrix*, const SkPaint*) SK_OVERRIDE;
 
 private:
     GrContext*      fContext;
     GrSkDrawProcs*  fDrawProcs;
-    GrClipData      fClipData;
+    SkAutoTUnref<const SkClipStack> fClipStack;

[bsalomon, 2015/02/23 19:31:30]

alignment

+    SkIPoint        fClipOrigin;
+    GrClip      fClipData;
     GrTextContext*  fTextContext;
     SkSurfaceProps  fSurfaceProps;
     GrRenderTarget* fRenderTarget;
     // remove when our clients don't rely on accessBitmap()
     SkBitmap        fLegacyBitmap;
     bool            fNeedClear;
 
     SkGpuDevice(GrRenderTarget*, const SkSurfaceProps*, unsigned flags);
 
     SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
@@ skipping 52 matching lines @@
 
     static SkPicture::AccelData::Key ComputeAccelDataKey();
 
     static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                               int sampleCount);
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif