diff options
| -rw-r--r-- | include/core/SkCanvas.h | 12 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 22 |
2 files changed, 7 insertions, 27 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 70cfe287b8..fa19176eeb 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1226,12 +1226,14 @@ protected: kFullLayer_SaveLayerStrategy, kNoLayer_SaveLayerStrategy }; - virtual void willSave(SaveFlags); - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags); - virtual void willRestore(); - virtual void didConcat(const SkMatrix&); - virtual void didSetMatrix(const SkMatrix&); + virtual void willSave(SaveFlags) {} + virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) { + return kFullLayer_SaveLayerStrategy; + } + virtual void willRestore() {} + virtual void didConcat(const SkMatrix&) {} + virtual void didSetMatrix(const SkMatrix&) {} virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&); diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 6c0fc884e1..57cf850fa0 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -830,10 +830,6 @@ int SkCanvas::internalSave(SaveFlags flags) { return saveCount; } -void SkCanvas::willSave(SaveFlags) { - // Do nothing. Subclasses may do something. -} - int SkCanvas::save() { this->willSave(kMatrixClip_SaveFlag); return this->internalSave(kMatrixClip_SaveFlag); @@ -897,12 +893,6 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags, return true; } -SkCanvas::SaveLayerStrategy SkCanvas::willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) { - - // Do nothing. Subclasses may do something. - return kFullLayer_SaveLayerStrategy; -} - int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint) { SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag); return this->internalSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag, false, strategy); @@ -999,10 +989,6 @@ int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha, } } -void SkCanvas::willRestore() { - // Do nothing. Subclasses may do something. -} - void SkCanvas::restore() { // check for underflow if (fMCStack.count() > 1) { @@ -1344,10 +1330,6 @@ void SkCanvas::skew(SkScalar sx, SkScalar sy) { this->concat(m); } -void SkCanvas::didConcat(const SkMatrix&) { - // Do nothing. Subclasses may do something. -} - void SkCanvas::concat(const SkMatrix& matrix) { if (matrix.isIdentity()) { return; @@ -1360,10 +1342,6 @@ void SkCanvas::concat(const SkMatrix& matrix) { this->didConcat(matrix); } -void SkCanvas::didSetMatrix(const SkMatrix&) { - // Do nothing. Subclasses may do something. -} - void SkCanvas::setMatrix(const SkMatrix& matrix) { fDeviceCMDirty = true; fCachedLocalClipBoundsDirty = true; |