diff options
| author | Sergei Vasilinetc <sergeyv@google.com> | 2016-03-21 21:03:40 +0000 |
|---|---|---|
| committer | Sergei Vasilinetc <sergeyv@google.com> | 2016-03-21 21:03:40 +0000 |
| commit | afbd0f1fef46ef0ddf633dfde0de724db3da1405 (patch) | |
| tree | 85e008cb0315362d002817fa912bd91c05d8dd4c /libs/hwui/RecordingCanvas.h | |
| parent | a7f6bba1a3565c19715e878dfe7f0e01022944ff (diff) | |
Revert "Move text logic from jni to hwui level"
This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff.
Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd
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 1eb4fa0b884f..719872d35169 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 drawGlyphs(const uint16_t* glyphs, const float* positions, int glyphCount, + virtual void drawText(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 drawGlyphsOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, + virtual void drawTextOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return false; } |