Index: src/utils/debugger/SkDebugCanvas.cpp |
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp |
index 77cf8a027b555addc497c3489b0627a014c5e3b9..238d4688a85111a9753eafb063d6cb5878e637cf 100644 |
--- a/src/utils/debugger/SkDebugCanvas.cpp |
+++ b/src/utils/debugger/SkDebugCanvas.cpp |
@@ -431,29 +431,21 @@ |
this->INHERITED::didConcat(matrix); |
} |
-void SkDebugCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar left, |
- SkScalar top, const SkPaint* paint) { |
+void SkDebugCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, |
+ SkScalar top, const SkPaint* paint = NULL) { |
this->addDrawCommand(new SkDrawBitmapCommand(bitmap, left, top, paint)); |
} |
-void SkDebugCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, |
- const SkPaint* paint, DrawBitmapRectFlags flags) { |
+void SkDebugCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, |
+ const SkRect* src, const SkRect& dst, |
+ const SkPaint* paint, |
+ SkCanvas::DrawBitmapRectFlags flags) { |
this->addDrawCommand(new SkDrawBitmapRectCommand(bitmap, src, dst, paint, flags)); |
} |
-void SkDebugCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, |
- const SkRect& dst, const SkPaint* paint) { |
+void SkDebugCanvas::drawBitmapNine(const SkBitmap& bitmap, |
+ const SkIRect& center, const SkRect& dst, const SkPaint* paint) { |
this->addDrawCommand(new SkDrawBitmapNineCommand(bitmap, center, dst, paint)); |
-} |
- |
-void SkDebugCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top, |
- const SkPaint* paint) { |
- SkDebugf("SkDebugCanvas::onDrawImage unimplemented\n"); |
-} |
- |
-void SkDebugCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, |
- const SkPaint* paint) { |
- SkDebugf("SkDebugCanvas::onDrawImageRect unimplemented\n"); |
} |
void SkDebugCanvas::beginCommentGroup(const char* description) { |
@@ -468,15 +460,15 @@ |
this->addDrawCommand(new SkEndCommentGroupCommand()); |
} |
-void SkDebugCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) { |
+void SkDebugCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { |
this->addDrawCommand(new SkDrawOvalCommand(oval, paint)); |
} |
-void SkDebugCanvas::onDrawPaint(const SkPaint& paint) { |
+void SkDebugCanvas::drawPaint(const SkPaint& paint) { |
this->addDrawCommand(new SkDrawPaintCommand(paint)); |
} |
-void SkDebugCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { |
+void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) { |
this->addDrawCommand(new SkDrawPathCommand(path, paint)); |
} |
@@ -486,8 +478,8 @@ |
this->addDrawCommand(new SkDrawPictureCommand(picture, matrix, paint)); |
} |
-void SkDebugCanvas::onDrawPoints(PointMode mode, size_t count, |
- const SkPoint pts[], const SkPaint& paint) { |
+void SkDebugCanvas::drawPoints(PointMode mode, size_t count, |
+ const SkPoint pts[], const SkPaint& paint) { |
this->addDrawCommand(new SkDrawPointsCommand(mode, count, pts, paint)); |
} |
@@ -502,12 +494,12 @@ |
new SkDrawPosTextHCommand(text, byteLength, xpos, constY, paint)); |
} |
-void SkDebugCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { |
+void SkDebugCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { |
// NOTE(chudy): Messing up when renamed to DrawRect... Why? |
addDrawCommand(new SkDrawRectCommand(rect, paint)); |
} |
-void SkDebugCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) { |
+void SkDebugCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { |
this->addDrawCommand(new SkDrawRRectCommand(rrect, paint)); |
} |
@@ -516,7 +508,8 @@ |
this->addDrawCommand(new SkDrawDRRectCommand(outer, inner, paint)); |
} |
-void SkDebugCanvas::onDrawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) { |
+void SkDebugCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, |
+ const SkPaint* paint = NULL) { |
this->addDrawCommand(new SkDrawSpriteCommand(bitmap, left, top, paint)); |
} |
@@ -536,10 +529,10 @@ |
this->addDrawCommand(new SkDrawTextBlobCommand(blob, x, y, paint)); |
} |
-void SkDebugCanvas::onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], |
- const SkPoint texs[], const SkColor colors[], |
- SkXfermode*, const uint16_t indices[], int indexCount, |
- const SkPaint& paint) { |
+void SkDebugCanvas::drawVertices(VertexMode vmode, int vertexCount, |
+ const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], |
+ SkXfermode*, const uint16_t indices[], int indexCount, |
+ const SkPaint& paint) { |
this->addDrawCommand(new SkDrawVerticesCommand(vmode, vertexCount, vertices, |
texs, colors, NULL, indices, indexCount, paint)); |
} |