diff options
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 19 | ||||
-rw-r--r-- | src/utils/SkDumpCanvas.cpp | 18 | ||||
-rw-r--r-- | src/utils/SkLuaCanvas.cpp | 18 | ||||
-rw-r--r-- | src/utils/SkNWayCanvas.cpp | 18 | ||||
-rw-r--r-- | src/utils/SkProxyCanvas.cpp | 18 | ||||
-rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 16 | ||||
-rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 22 |
7 files changed, 73 insertions, 56 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index 9f444e11f3..4836cd7be4 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -904,29 +904,32 @@ void SkDeferredCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, this->recordedDrawCommand(); } -void SkDeferredCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkDeferredCanvas::drawText(const void* text, size_t byteLength, + SkScalar x, SkScalar y, const SkPaint& paint) { AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawText(text, byteLength, x, y, paint); this->recordedDrawCommand(); } -void SkDeferredCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkDeferredCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawPosText(text, byteLength, pos, paint); this->recordedDrawCommand(); } -void SkDeferredCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkDeferredCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) { AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawPosTextH(text, byteLength, xpos, constY, paint); this->recordedDrawCommand(); } -void SkDeferredCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkDeferredCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, + const SkMatrix* matrix, + const SkPaint& paint) { AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawTextOnPath(text, byteLength, path, matrix, paint); this->recordedDrawCommand(); diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 9814fb5762..3bf90da9f5 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -388,16 +388,16 @@ void SkDumpCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, x, y); } -void SkDumpCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkDumpCanvas::drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) { SkString str; toString(text, byteLength, paint.getTextEncoding(), &str); this->dump(kDrawText_Verb, &paint, "drawText(%s [%d] %g %g)", str.c_str(), byteLength, SkScalarToFloat(x), SkScalarToFloat(y)); } -void SkDumpCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkDumpCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { SkString str; toString(text, byteLength, paint.getTextEncoding(), &str); this->dump(kDrawText_Verb, &paint, "drawPosText(%s [%d] %g %g ...)", @@ -405,8 +405,9 @@ void SkDumpCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPo SkScalarToFloat(pos[0].fY)); } -void SkDumpCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkDumpCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) { SkString str; toString(text, byteLength, paint.getTextEncoding(), &str); this->dump(kDrawText_Verb, &paint, "drawPosTextH(%s [%d] %g %g ...)", @@ -414,8 +415,9 @@ void SkDumpCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkS SkScalarToFloat(constY)); } -void SkDumpCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkDumpCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) { SkString str; toString(text, byteLength, paint.getTextEncoding(), &str); this->dump(kDrawText_Verb, &paint, "drawTextOnPath(%s [%d])", diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp index 7e7f1730ba..531cbb0064 100644 --- a/src/utils/SkLuaCanvas.cpp +++ b/src/utils/SkLuaCanvas.cpp @@ -237,29 +237,31 @@ void SkLuaCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, } } -void SkLuaCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkLuaCanvas::drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) { AUTO_LUA("drawText"); lua.pushEncodedText(paint.getTextEncoding(), text, byteLength); lua.pushPaint(paint, "paint"); } -void SkLuaCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkLuaCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { AUTO_LUA("drawPosText"); lua.pushEncodedText(paint.getTextEncoding(), text, byteLength); lua.pushPaint(paint, "paint"); } -void SkLuaCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkLuaCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) { AUTO_LUA("drawPosTextH"); lua.pushEncodedText(paint.getTextEncoding(), text, byteLength); lua.pushPaint(paint, "paint"); } -void SkLuaCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkLuaCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) { AUTO_LUA("drawTextOnPath"); lua.pushPath(path, "path"); lua.pushEncodedText(paint.getTextEncoding(), text, byteLength); diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp index f78c65382f..4e580c2ea1 100644 --- a/src/utils/SkNWayCanvas.cpp +++ b/src/utils/SkNWayCanvas.cpp @@ -233,32 +233,34 @@ void SkNWayCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, } } -void SkNWayCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkNWayCanvas::drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) { Iter iter(fList); while (iter.next()) { iter->drawText(text, byteLength, x, y, paint); } } -void SkNWayCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkNWayCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { Iter iter(fList); while (iter.next()) { iter->drawPosText(text, byteLength, pos, paint); } } -void SkNWayCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkNWayCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) { Iter iter(fList); while (iter.next()) { iter->drawPosTextH(text, byteLength, xpos, constY, paint); } } -void SkNWayCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkNWayCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) { Iter iter(fList); while (iter.next()) { iter->drawTextOnPath(text, byteLength, path, matrix, paint); diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp index e680caad26..26f2c73d18 100644 --- a/src/utils/SkProxyCanvas.cpp +++ b/src/utils/SkProxyCanvas.cpp @@ -116,23 +116,25 @@ void SkProxyCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, fProxy->drawSprite(bitmap, x, y, paint); } -void SkProxyCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkProxyCanvas::drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) { fProxy->drawText(text, byteLength, x, y, paint); } -void SkProxyCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkProxyCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { fProxy->drawPosText(text, byteLength, pos, paint); } -void SkProxyCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkProxyCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) { fProxy->drawPosTextH(text, byteLength, xpos, constY, paint); } -void SkProxyCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkProxyCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) { fProxy->drawTextOnPath(text, byteLength, path, matrix, paint); } diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index ec201789fd..18affcb418 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -506,13 +506,13 @@ void SkDebugCanvas::drawPoints(PointMode mode, size_t count, this->addDrawCommand(new SkDrawPointsCommand(mode, count, pts, paint)); } -void SkDebugCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) { +void SkDebugCanvas::drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) { this->addDrawCommand(new SkDrawPosTextCommand(text, byteLength, pos, paint)); } -void SkDebugCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) { +void SkDebugCanvas::drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, const SkPaint& paint) { this->addDrawCommand( new SkDrawPosTextHCommand(text, byteLength, xpos, constY, paint)); } @@ -536,13 +536,13 @@ void SkDebugCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, this->addDrawCommand(new SkDrawSpriteCommand(bitmap, left, top, paint)); } -void SkDebugCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) { +void SkDebugCanvas::drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) { this->addDrawCommand(new SkDrawTextCommand(text, byteLength, x, y, paint)); } -void SkDebugCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint& paint) { +void SkDebugCanvas::drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) { this->addDrawCommand( new SkDrawTextOnPathCommand(text, byteLength, path, matrix, paint)); } diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index d4fded7c1a..d89cf9491f 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -189,6 +189,13 @@ public: virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; + virtual void drawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint&) SK_OVERRIDE; + + virtual void drawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + 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; @@ -196,6 +203,13 @@ public: virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + virtual void drawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint&) SK_OVERRIDE; + + virtual void drawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint&) SK_OVERRIDE; + virtual void drawVertices(VertexMode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode*, @@ -236,14 +250,6 @@ protected: virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; virtual 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 onPushCull(const SkRect& cullRect) SK_OVERRIDE; virtual void onPopCull() SK_OVERRIDE; |