Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: src/utils/debugger/SkDebugCanvas.h

Issue 831253002: Revert of Revert of move remaining virtual draw methods to onDraw (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkProxyCanvas.cpp ('k') | src/utils/debugger/SkDebugCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/debugger/SkDebugCanvas.h
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index a74c41354fe1a3bc5b24e5f7882f0143721567a6..d74d30d24d8572b79b0f77f00d9352c68d66286d 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -148,43 +148,9 @@
// Inherited from SkCanvas
////////////////////////////////////////////////////////////////////////////////
- virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
- const SkPaint*) SK_OVERRIDE;
-
- virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src,
- const SkRect& dst, const SkPaint* paint,
- DrawBitmapRectFlags flags) SK_OVERRIDE;
-
- virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
- const SkRect& dst, const SkPaint*) SK_OVERRIDE;
-
virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-
virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-
virtual void endCommentGroup() SK_OVERRIDE;
-
- virtual void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE;
-
- virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-
- virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-
- virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
- const SkPaint&) SK_OVERRIDE;
-
- virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
-
- virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
-
- virtual void drawSprite(const SkBitmap&, int left, int top,
- const SkPaint*) SK_OVERRIDE;
-
- virtual void drawVertices(VertexMode, int vertexCount,
- const SkPoint vertices[], const SkPoint texs[],
- const SkColor colors[], SkXfermode*,
- const uint16_t indices[], int indexCount,
- const SkPaint&) SK_OVERRIDE;
static const int kVizImageHeight = 256;
static const int kVizImageWidth = 256;
@@ -226,6 +192,27 @@
virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
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;
« no previous file with comments | « src/utils/SkProxyCanvas.cpp ('k') | src/utils/debugger/SkDebugCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698