clean up for removing drawTextOnPath from canvas
Docs-Preview: https://skia.org/?cl=150127
Bug: skia:7554
Change-Id: I4aa980e083626e25c2f04d8e18a75bdc280b5191
Reviewed-on: https://skia-review.googlesource.com/150127
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/docs/SkCanvas_Reference.bmh b/docs/SkCanvas_Reference.bmh
index 08f1dd3..85faecc 100644
--- a/docs/SkCanvas_Reference.bmh
+++ b/docs/SkCanvas_Reference.bmh
@@ -5273,18 +5273,6 @@
# ------------------------------------------------------------------------------
-#Method void drawTextOnPathHV(const void* text, size_t byteLength, const SkPath& path, SkScalar hOffset,
- SkScalar vOffset, const SkPaint& paint)
-#Deprecated
-##
-
-#Method void drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint& paint)
-#Deprecated
-##
-
-# ------------------------------------------------------------------------------
-
#Method void drawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[],
const SkRect* cullRect, const SkPaint& paint)
#In Draw_Text
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 0522f2d..869ef72 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1946,18 +1946,6 @@
void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY,
const SkPaint& paint);
-#ifdef SK_SUPPORT_LEGACY_DRAWTEXTONPATH
- /** Deprecated.
- */
- void drawTextOnPathHV(const void* text, size_t byteLength, const SkPath& path, SkScalar hOffset,
- SkScalar vOffset, const SkPaint& paint);
-
- /** Deprecated.
- */
- void drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint& paint);
-#endif
-
/** Draws text, transforming each glyph by the corresponding SkRSXform,
using clip, SkMatrix, and SkPaint paint.
@@ -2433,13 +2421,6 @@
virtual void onDrawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
const SkPaint& paint);
-#ifdef SK_SUPPORT_LEGACY_DRAWTEXTONPATH
-#ifdef SK_SUPPORT_LEGACY_ONDRAWTEXTONPATH
- // DEPRECATED -- do not override
- virtual void onDrawTextOnPath(const void*, size_t, const SkPath&, const SkMatrix*,
- const SkPaint&) {}
-#endif
-#endif
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/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md
index 4188be2..9a52869 100644
--- a/site/user/api/SkCanvas_Reference.md
+++ b/site/user/api/SkCanvas_Reference.md
@@ -6058,30 +6058,6 @@
---
-<a name='SkCanvas_drawTextOnPathHV'></a>
-## drawTextOnPathHV
-
-<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
-void <a href='#SkCanvas_drawTextOnPathHV'>drawTextOnPathHV</a>(const void* text, size_t byteLength, const <a href='SkPath_Reference#SkPath'>SkPath</a>& path, <a href='undocumented#SkScalar'>SkScalar</a> hOffset,
- <a href='undocumented#SkScalar'>SkScalar</a> vOffset, const <a href='SkPaint_Reference#SkPaint'>SkPaint</a>& paint)
-</pre>
-
-Deprecated.
-
----
-
-<a name='SkCanvas_drawTextOnPath'></a>
-## drawTextOnPath
-
-<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
-void <a href='#SkCanvas_drawTextOnPath'>drawTextOnPath</a>(const void* text, size_t byteLength, const <a href='SkPath_Reference#SkPath'>SkPath</a>& path, const <a href='SkMatrix_Reference#SkMatrix'>SkMatrix</a>* matrix,
- const <a href='SkPaint_Reference#SkPaint'>SkPaint</a>& paint)
-</pre>
-
-Deprecated.
-
----
-
<a name='SkCanvas_drawTextRSXform'></a>
## drawTextRSXform
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 3c66190..19153ab 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2548,27 +2548,6 @@
}
}
-#ifdef SK_SUPPORT_LEGACY_DRAWTEXTONPATH
-#include "SkTextOnPath.h"
-void SkCanvas::drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint& paint) {
- TRACE_EVENT0("skia", TRACE_FUNC);
- if (byteLength) {
- sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
-
- SkDrawTextOnPath(text, byteLength, paint, path, matrix, this);
- }
-}
-void SkCanvas::drawTextOnPathHV(const void* text, size_t byteLength,
- const SkPath& path, SkScalar hOffset,
- SkScalar vOffset, const SkPaint& paint) {
- SkMatrix matrix;
-
- matrix.setTranslate(hOffset, vOffset);
- this->drawTextOnPath(text, byteLength, path, &matrix, paint);
-}
-#endif
-
void SkCanvas::drawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[],
const SkRect* cullRect, const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);