diff options
| author | sergeyv <sergeyv@google.com> | 2016-03-21 15:38:21 -0700 |
|---|---|---|
| committer | sergeyv <sergeyv@google.com> | 2016-03-21 15:55:46 -0700 |
| commit | dccca44ffda4836b56a21da95a046c9708ffd49c (patch) | |
| tree | e4c0bcfeb0f37f0fd6ed4a08d58e701494bc61a8 /libs/hwui/RecordingCanvas.h | |
| parent | c57fc4787f5aadb129686e904b86d343c8ae3541 (diff) | |
Reland: Move text logic from jni to hwui level
Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/
Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
Diffstat (limited to 'libs/hwui/RecordingCanvas.h')
| -rw-r--r-- | libs/hwui/RecordingCanvas.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h index 719872d35169..1eb4fa0b884f 100644 --- a/libs/hwui/RecordingCanvas.h +++ b/libs/hwui/RecordingCanvas.h @@ -17,12 +17,12 @@ #ifndef ANDROID_HWUI_RECORDING_CANVAS_H #define ANDROID_HWUI_RECORDING_CANVAS_H -#include "Canvas.h" #include "CanvasState.h" #include "DisplayList.h" #include "ResourceCache.h" #include "SkiaCanvasProxy.h" #include "Snapshot.h" +#include "hwui/Canvas.h" #include "utils/LinearAllocator.h" #include "utils/Macros.h" #include "utils/NinePatch.h" @@ -191,10 +191,10 @@ public: const SkPaint* paint) override; // Text - virtual void drawText(const uint16_t* glyphs, const float* positions, int glyphCount, + virtual void drawGlyphs(const uint16_t* glyphs, const float* positions, int glyphCount, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) override; - virtual void drawTextOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, + virtual void drawGlyphsOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return false; } |