Index: src/utils/debugger/SkDebugCanvas.h |
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h |
index e1ad077f8341316bf8b6b1d70af591349faf2e69..97eb73449c807f17fa0aa26594c937eeeaaab46e 100644 |
--- a/src/utils/debugger/SkDebugCanvas.h |
+++ b/src/utils/debugger/SkDebugCanvas.h |
@@ -175,22 +175,30 @@ protected: |
void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, |
- const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], |
- const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], |
- SkScalar constY, const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, |
- const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, |
- const SkPaint& paint) SK_OVERRIDE; |
- |
+ void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, |
+ const SkPaint&) SK_OVERRIDE; |
+ void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], |
+ const SkPaint&) SK_OVERRIDE; |
+ void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], |
+ SkScalar constY, const SkPaint&) SK_OVERRIDE; |
+ void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, |
+ const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; |
+ void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, |
+ const SkPaint& paint) SK_OVERRIDE; |
+ |
+ void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], |
+ const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint); |
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 onDrawPoints(PointMode, size_t count, const SkPoint pts[], 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; |
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*, |
@@ -201,12 +209,6 @@ protected: |
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; |
- |
void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |