diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-04 14:06:06 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-04 14:06:06 +0000 |
| commit | 8182fa0cac76e7e6d583aebba060229230516887 (patch) | |
| tree | 9857caea2550f6bf3645bd1297a8eeb91bed7843 /src/gpu/GrClipMaskManager.h | |
| parent | e659c2e820de0b8d12d81247ed4430022ded0a90 (diff) | |
Make SkClipStack::Iter use SkClipStack::Element.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6871051
git-svn-id: http://skia.googlecode.com/svn/trunk@6661 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrClipMaskManager.h')
| -rw-r--r-- | src/gpu/GrClipMaskManager.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h index 4894a3a70c..c3a1b5ee70 100644 --- a/src/gpu/GrClipMaskManager.h +++ b/src/gpu/GrClipMaskManager.h @@ -19,6 +19,7 @@ #include "SkDeque.h" #include "SkPath.h" #include "SkRefCnt.h" +#include "SkTLList.h" #include "GrClipMaskCache.h" @@ -125,7 +126,7 @@ private: bool useSWOnlyPath(const SkClipStack& clipIn); bool drawClipShape(GrTexture* target, - const SkClipStack::Iter::Clip* clip, + const SkClipStack::Element* element, const GrIRect& resultBounds); void mergeMask(GrTexture* dstMask, @@ -157,9 +158,10 @@ private: typedef GrNoncopyable INHERITED; }; - namespace GrReducedClip { +typedef SkTLList<SkClipStack::Element> ElementList; + enum InitialState { kAllIn_InitialState, kAllOut_InitialState, @@ -175,7 +177,7 @@ enum InitialState { * may become a member function of SkClipStack when its interface is determined to be stable. */ void GrReduceClipStack(const SkClipStack& stack, - SkTDArray<SkClipStack::Iter::Clip>* resultClips, + ElementList* result, SkRect* resultBounds, bool* resultsAreBounded, InitialState* initialState); |