convert pathops to use SkSTArray where possible.
Replace SkTDArray with SkTArray and use SkSTArray when
the probable array size is known.
In a couple of places (spans, chases) the arrays are
constructed using insert() so SkTArrays can't be used for
now.
Also, add an optimization to cubic subdivide if either end
is zero or one.
BUG=
Review URL: https://codereview.chromium.org/16951017
git-svn-id: http://skia.googlecode.com/svn/trunk@9635 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h
index c57fbac..84f0eb1 100644
--- a/src/pathops/SkOpContour.h
+++ b/src/pathops/SkOpContour.h
@@ -46,7 +46,7 @@
SkASSERT(fCrosses[index] != crosser);
}
#endif
- *fCrosses.append() = crosser;
+ fCrosses.push_back(crosser);
}
void addCubic(const SkPoint pts[4]) {
@@ -214,17 +214,17 @@
#if DEBUG_SHOW_WINDING
int debugShowWindingValues(int totalSegments, int ofInterest);
- static void debugShowWindingValues(const SkTDArray<SkOpContour*>& contourList);
+ static void debugShowWindingValues(const SkTArray<SkOpContour*, true>& contourList);
#endif
private:
void setBounds();
SkTArray<SkOpSegment> fSegments;
- SkTDArray<SkOpSegment*> fSortedSegments;
+ SkTArray<SkOpSegment*, true> fSortedSegments;
int fFirstSorted;
- SkTDArray<SkCoincidence> fCoincidences;
- SkTDArray<const SkOpContour*> fCrosses;
+ SkTArray<SkCoincidence, true> fCoincidences;
+ SkTArray<const SkOpContour*, true> fCrosses;
SkPathOpsBounds fBounds;
bool fContainsIntercepts; // FIXME: is this used by anybody?
bool fContainsCubics;