diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index cb441dfa51..020ee81e31 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -2441,16 +2441,6 @@ protected: virtual void onDrawPath(const SkPath& path, const SkPaint& paint); virtual void onDrawRegion(const SkRegion& region, const SkPaint& paint); - // DEPRECATED -- this is never called - virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, - SkScalar y, const SkPaint& paint); - // DEPRECATED -- this is never called - virtual void onDrawPosText(const void* text, size_t byteLength, - const SkPoint pos[], const SkPaint& paint); - // DEPRECATED -- this is never called - virtual void onDrawPosTextH(const void* text, size_t byteLength, - const SkScalar xpos[], SkScalar constY, - const SkPaint& paint); virtual void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[], const SkRect* cullRect, const SkPaint& paint); virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 9f2008b5ae..bdd330ecb6 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2436,13 +2436,6 @@ void SkCanvas::onDrawBitmapLattice(const SkBitmap& bitmap, const Lattice& lattic LOOPER_END } -void SkCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint& paint) {} -void SkCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint& paint) {} -void SkCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint& paint) {} - void SkCanvas::onDrawTextRSXform(const void* text, size_t len, const SkRSXform xform[], const SkRect* cullRect, const SkPaint& paint) { if (cullRect && this->quickReject(*cullRect)) {