diff options
| author |  reed <reed@chromium.org> | 2015-02-17 10:33:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-17 10:33:54 -0800 |
| commit | f87fe78bc36c94143625fc38cc848d0da86eb60d (patch) | |
| tree | 9e6fb1933fd8a7968aec80ab1d73bc2e27b48d1d /include | |
| parent | 2682700b8868b363809fc4c5e1733edb6e73c9a1 (diff) | |
use common impl for drawTextOnPath
BUG=skia:
Review URL: https://codereview.chromium.org/925343003
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkBitmapDevice.h | 3 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 5 | ||||
| -rw-r--r-- | include/core/SkDraw.h | 2 | ||||
| -rw-r--r-- | include/pdf/SkPDFDevice.h | 3 |
4 files changed, 2 insertions, 11 deletions
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index a801420584..8ca6a523be 100644 --- a/include/core/SkBitmapDevice.h +++ b/include/core/SkBitmapDevice.h @@ -93,9 +93,6 @@ protected: virtual void drawPosText(const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE; - virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, - const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint) SK_OVERRIDE; virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 9f3ac58008..777b7f8fd7 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -218,9 +218,6 @@ protected: virtual void drawPosText(const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) = 0; - virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, - const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint) = 0; virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, @@ -238,6 +235,8 @@ protected: virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) = 0; + virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath&, + const SkMatrix*, const SkPaint&); bool readPixels(const SkImageInfo&, void* dst, size_t rowBytes, int x, int y); /////////////////////////////////////////////////////////////////////////// diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h index 2bb9c89627..7b5514d13b 100644 --- a/include/core/SkDraw.h +++ b/include/core/SkDraw.h @@ -68,8 +68,6 @@ public: void drawPosText(const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset, const SkPaint& paint) const; - void drawTextOnPath(const char text[], size_t byteLength, - const SkPath&, const SkMatrix*, const SkPaint&) const; void drawVertices(SkCanvas::VertexMode mode, int count, const SkPoint vertices[], const SkPoint textures[], const SkColor colors[], SkXfermode* xmode, diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h index 66689f2872..af650055cd 100644 --- a/include/pdf/SkPDFDevice.h +++ b/include/pdf/SkPDFDevice.h @@ -98,9 +98,6 @@ public: void drawPosText(const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint&) SK_OVERRIDE; - void drawTextOnPath(const SkDraw&, const void* text, size_t len, - const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint) SK_OVERRIDE; void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], |