diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-17 17:34:20 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-17 17:34:20 +0000 |
commit | c2cc1dbe818c8a5a699fbe18c4fc79b9d93daa94 (patch) | |
tree | d9d5b8aa79d17c0a5683a70fd57f92e55de27ca2 /include/core/SkCanvas.h | |
parent | 4256d2494e80cb6c9a2db4157adc9b9daff028a6 (diff) |
Revert r11842 (call drawRect to try GrAARectRenderer if the path is a rect - https://codereview.chromium.org/23484007) due to changes to the following GM images:
inverse_paths
pathopsinverse
git-svn-id: http://skia.googlecode.com/svn/trunk@11845 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkCanvas.h')
-rw-r--r-- | include/core/SkCanvas.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 8c09a9c91e..dc3953ed4b 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -575,20 +575,16 @@ 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) { - this->onDrawRect(rect, paint); - } + virtual void drawRect(const SkRect& rect, const SkPaint& 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); @@ -660,18 +656,8 @@ 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) { - SkRect rect; - if (path.isRect(&rect)) { - this->onDrawRect(rect, paint); - } else { - this->onDrawPath(path, paint); - } - } + virtual void drawPath(const SkPath& path, const SkPaint& 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 @@ -1048,10 +1034,6 @@ 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 |