diff options
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkCanvas.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index dc3953ed4b..8c09a9c91e 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -575,16 +575,20 @@ public: will be filled or stroked based on the Style in the paint. @param rect The rect to be drawn @param paint The paint used to draw the rect + + Overriding this function is deprecated. It will be made non-virtual + soon. Instead override onDrawRect. */ - virtual void drawRect(const SkRect& rect, const SkPaint& paint); + virtual void drawRect(const SkRect& rect, const SkPaint& paint) { + this->onDrawRect(rect, paint); + } /** Draw the specified rectangle using the specified paint. The rectangle will be filled or framed based on the Style in the paint. @param rect The rect to be drawn @param paint The paint used to draw the rect */ - void drawIRect(const SkIRect& rect, const SkPaint& paint) - { + void drawIRect(const SkIRect& rect, const SkPaint& paint) { SkRect r; r.set(rect); // promotes the ints to scalars this->drawRect(r, paint); @@ -656,8 +660,18 @@ public: filled or framed based on the Style in the paint. @param path The path to be drawn @param paint The paint used to draw the path + + Overriding this function is deprecated. It will be made non-virtual + soon. Instead override onDrawRect. */ - virtual void drawPath(const SkPath& path, const SkPaint& paint); + virtual void drawPath(const SkPath& path, const SkPaint& paint) { + SkRect rect; + if (path.isRect(&rect)) { + this->onDrawRect(rect, paint); + } else { + this->onDrawPath(path, paint); + } + } /** Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint, transformed by the current matrix. Note: if the paint @@ -1034,6 +1048,10 @@ protected: // can perform copy-on-write or invalidate any cached images void predrawNotify(); + virtual void onDrawRect(const SkRect& rect, const SkPaint& paint); + + virtual void onDrawPath(const SkPath& path, const SkPaint& paint); + /** DEPRECATED -- use constructor(device) Marked as 'protected' to avoid new clients using this before we can |