Index: src/core/SkCanvas.cpp |
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp |
index 56cfb8d652ad1e43867e7304c820f809d654d5eb..055e6737a6fd5bfc48242984f6a7db7d244646d5 100644 |
--- a/src/core/SkCanvas.cpp |
+++ b/src/core/SkCanvas.cpp |
@@ -232,7 +232,7 @@ public: |
fCanvas = canvas; |
canvas->updateDeviceCMCache(); |
- fClipStack = &canvas->fClipStack; |
+ fClipStack = canvas->fClipStack.get(); |
fCurrLayer = canvas->fMCRec->fTopLayer; |
fSkipEmptyClips = skipEmptyClips; |
} |
@@ -442,6 +442,8 @@ SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) { |
fSurfaceBase = NULL; |
+ fClipStack.reset(SkNEW(SkClipStack)); |
+ |
if (device) { |
device->initForRootLayer(fProps.pixelGeometry()); |
if (device->forceConservativeRasterClip()) { |
@@ -788,11 +790,11 @@ void SkCanvas::updateDeviceCMCache() { |
DeviceCM* layer = fMCRec->fTopLayer; |
if (NULL == layer->fNext) { // only one layer |
- layer->updateMC(totalMatrix, totalClip, fClipStack, NULL); |
+ layer->updateMC(totalMatrix, totalClip, *fClipStack, NULL); |
} else { |
SkRasterClip clip(totalClip); |
do { |
- layer->updateMC(totalMatrix, clip, fClipStack, &clip); |
+ layer->updateMC(totalMatrix, clip, *fClipStack, &clip); |
} while ((layer = layer->fNext) != NULL); |
} |
fDeviceCMDirty = false; |
@@ -869,7 +871,7 @@ void SkCanvas::internalSave() { |
new (newTop) MCRec(*fMCRec); // balanced in restore() |
fMCRec = newTop; |
- fClipStack.save(); |
+ fClipStack->save(); |
} |
static bool bounds_affects_clip(SkCanvas::SaveFlags flags) { |
@@ -911,7 +913,7 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags, |
} |
if (bounds_affects_clip(flags)) { |
- fClipStack.clipDevRect(ir, op); |
+ fClipStack->clipDevRect(ir, op); |
// early exit if the clip is now empty |
if (!fMCRec->fRasterClip.op(ir, op)) { |
return false; |
@@ -1033,7 +1035,7 @@ void SkCanvas::internalRestore() { |
fDeviceCMDirty = true; |
fCachedLocalClipBoundsDirty = true; |
- fClipStack.restore(); |
+ fClipStack->restore(); |
// reserve our layer (if any) |
DeviceCM* layer = fMCRec->fLayer; // may be null |
@@ -1338,7 +1340,7 @@ void SkCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edg |
SkRect r; |
fMCRec->fMatrix.mapRect(&r, rect); |
- fClipStack.clipDevRect(r, op, kSoft_ClipEdgeStyle == edgeStyle); |
+ fClipStack->clipDevRect(r, op, kSoft_ClipEdgeStyle == edgeStyle); |
fMCRec->fRasterClip.op(r, this->getBaseLayerSize(), op, kSoft_ClipEdgeStyle == edgeStyle); |
} else { |
// since we're rotated or some such thing, we convert the rect to a path |
@@ -1378,7 +1380,7 @@ void SkCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle |
edgeStyle = kHard_ClipEdgeStyle; |
} |
- fClipStack.clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle); |
+ fClipStack->clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle); |
SkPath devPath; |
devPath.addRRect(transformedRRect); |
@@ -1443,7 +1445,7 @@ void SkCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edg |
} |
// if we called path.swap() we could avoid a deep copy of this path |
- fClipStack.clipDevPath(devPath, op, kSoft_ClipEdgeStyle == edgeStyle); |
+ fClipStack->clipDevPath(devPath, op, kSoft_ClipEdgeStyle == edgeStyle); |
if (fAllowSimplifyClip) { |
bool clipIsAA = getClipStack()->asPath(&devPath); |
@@ -1470,7 +1472,7 @@ void SkCanvas::onClipRegion(const SkRegion& rgn, SkRegion::Op op) { |
// todo: signal fClipStack that we have a region, and therefore (I guess) |
// we have to ignore it, and use the region directly? |
- fClipStack.clipDevRect(rgn.getBounds(), op); |
+ fClipStack->clipDevRect(rgn.getBounds(), op); |
fMCRec->fRasterClip.op(rgn, op); |
} |
@@ -1488,7 +1490,7 @@ void SkCanvas::validateClip() const { |
ir.set(0, 0, device->width(), device->height()); |
SkRasterClip tmpClip(ir, fConservativeRasterClip); |
- SkClipStack::B2TIter iter(fClipStack); |
+ SkClipStack::B2TIter iter(*fClipStack); |
const SkClipStack::Element* element; |
while ((element = iter.next()) != NULL) { |
switch (element->getType()) { |
@@ -1511,7 +1513,7 @@ void SkCanvas::validateClip() const { |
#endif |
void SkCanvas::replayClips(ClipVisitor* visitor) const { |
- SkClipStack::B2TIter iter(fClipStack); |
+ SkClipStack::B2TIter iter(*fClipStack); |
const SkClipStack::Element* element; |
while ((element = iter.next()) != NULL) { |