aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-29 21:14:59 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-29 21:14:59 +0000
commit5fac58c91d8053dcc05c5bc72cfccee9246d9add (patch)
tree09034496ac3de4a5b7f872248da1f7663a124e16 /include/core
parent9f686f3639ff87e6d28b4ffcc42feebeca90f8d8 (diff)
Remove SkClipStack::Iter::combinedNext.
Review URL: https://codereview.appspot.com/6844114 git-svn-id: http://skia.googlecode.com/svn/trunk@6619 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkClipStack.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index eb825a9876..4155bd0062 100644
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@@ -318,14 +318,6 @@ public:
const Clip* prev();
/**
- * This is a variant of next() that greedily attempts to combine elements when possible.
- * Currently it attempts to combine intersecting rectangles, though it may do more in the
- * future. The returned Clip may not refer to a single element in the stack, so its
- * generation ID may be invalid.
- */
- const Clip* nextCombined();
-
- /**
* Moves the iterator to the topmost clip with the specified RegionOp
* and returns that clip. If no clip with that op is found,
* returns NULL.
@@ -341,7 +333,6 @@ public:
const SkClipStack* fStack;
Clip fClip;
SkDeque::Iter fIter;
- SkRect fCombinedRect; // used for nextCombined()
/**
* updateClip updates fClip to the current state of fIter. It unifies
* functionality needed by both next() and prev().