diff options
author | reed <reed@chromium.org> | 2015-01-04 21:09:04 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-04 21:09:04 -0800 |
commit | 2e0f7d53bba5438c9bf11ee5ccae2c301e348419 (patch) | |
tree | 51f14164a524fff3b3f1b3043b8399c89e72e3f9 /include/utils/SkNWayCanvas.h | |
parent | ede901c7a2e21a44552b8c1436d9521ce33f4de5 (diff) |
move remaining virtual draw methods to onDraw
BUG=skia:
Review URL: https://codereview.chromium.org/817723005
Diffstat (limited to 'include/utils/SkNWayCanvas.h')
-rw-r--r-- | include/utils/SkNWayCanvas.h | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h index 5e8c52d136..b547fe524a 100644 --- a/include/utils/SkNWayCanvas.h +++ b/include/utils/SkNWayCanvas.h @@ -23,34 +23,6 @@ public: /////////////////////////////////////////////////////////////////////////// // These are forwarded to the N canvases we're referencing - virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE; - virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[], - const SkPaint&) SK_OVERRIDE; - virtual void drawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; - virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; - virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; - virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE; - virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, - const SkPaint*) SK_OVERRIDE; - virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, - const SkRect& dst, const SkPaint* paint, - DrawBitmapRectFlags flags) SK_OVERRIDE; - virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top, - const SkPaint* paint) SK_OVERRIDE; - virtual void drawImageRect(const SkImage* image, const SkRect* src, - const SkRect& dst, - const SkPaint* paint) SK_OVERRIDE; - virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, - const SkRect& dst, - const SkPaint* paint = NULL) SK_OVERRIDE; - virtual void drawSprite(const SkBitmap& bitmap, int left, int top, - const SkPaint*) SK_OVERRIDE; - virtual void drawVertices(VertexMode vmode, int vertexCount, - const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SkXfermode* xmode, - const uint16_t indices[], int indexCount, - const SkPaint&) SK_OVERRIDE; - virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; virtual void beginCommentGroup(const char* description) SK_OVERRIDE; @@ -82,6 +54,27 @@ protected: const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) SK_OVERRIDE; + void onDrawPaint(const SkPaint&) SK_OVERRIDE; + void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; + void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; + void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; + void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE; + void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, + DrawBitmapRectFlags flags) SK_OVERRIDE; + void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, + const SkPaint*) SK_OVERRIDE; + void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, + const SkPaint*) SK_OVERRIDE; + void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + void onDrawVertices(VertexMode vmode, int vertexCount, + const SkPoint vertices[], const SkPoint texs[], + const SkColor colors[], SkXfermode* xmode, + const uint16_t indices[], int indexCount, + const SkPaint&) SK_OVERRIDE; + virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |