diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-10 12:21:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 12:21:29 -0700 |
| commit | 74054d95b10bbd34ffbed078b1a673a9622c5281 (patch) | |
| tree | a3cb17c0945391e6d8ec614bb61ea3ef0dc8ae5a /include/core/SkDevice.h | |
| parent | 4b9b073d4cc3ada977b28803bb5471005ba7e250 (diff) | |
| parent | ff1f66966879e612660387285b7ead9c040ff88f (diff) | |
| download | external_skia-74054d95b10bbd34ffbed078b1a673a9622c5281.zip external_skia-74054d95b10bbd34ffbed078b1a673a9622c5281.tar.gz external_skia-74054d95b10bbd34ffbed078b1a673a9622c5281.tar.bz2 | |
am ff1f6696: merge from open-source master
Merge commit 'ff1f66966879e612660387285b7ead9c040ff88f' into kraken
* commit 'ff1f66966879e612660387285b7ead9c040ff88f':
Improved error handling when font loading fails.
Added drawPosTextOnPath method.
Adding check for missing color map in GIF decoder.
Diffstat (limited to 'include/core/SkDevice.h')
| -rw-r--r-- | include/core/SkDevice.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 4d678c6..0d724ba 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -120,6 +120,9 @@ public: virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath& path, const SkMatrix* matrix, const SkPaint& paint); + virtual void drawPosTextOnPath(const SkDraw& draw, const void* text, size_t len, + const SkPoint pos[], const SkPaint& paint, + const SkPath& path, const SkMatrix* matrix); virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, |