diff options
| -rw-r--r-- | include/core/SkCanvas.h | 4 | ||||
| -rw-r--r-- | include/utils/SkProxyCanvas.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 738408bf5..a08e82800 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1201,9 +1201,9 @@ protected: }; // Transitional, pending external clients cleanup. - virtual void willSave(SaveFlags) {} + virtual void willSave(SaveFlags) { this->willSave(); } - virtual void willSave() { this->willSave(kMatrixClip_SaveFlag); } + virtual void willSave() {} virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) { return kFullLayer_SaveLayerStrategy; } diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h index 09bf37578..32f103cd2 100644 --- a/include/utils/SkProxyCanvas.h +++ b/include/utils/SkProxyCanvas.h @@ -55,6 +55,9 @@ public: virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; + // Transitional, to facilitate migrating subclasses to the new willSave API. + using SkCanvas::willSave; + protected: virtual void willSave(SaveFlags) SK_OVERRIDE; virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; |