diff options
author | sergeyv <sergeyv@google.com> | 2016-03-15 16:16:22 -0700 |
---|---|---|
committer | sergeyv <sergeyv@google.com> | 2016-03-17 09:48:57 -0700 |
commit | a7f6bba1a3565c19715e878dfe7f0e01022944ff (patch) | |
tree | 6f981aa976c049bf207727229f1275a3a6e8e530 /libs/hwui/RecordingCanvas.h | |
parent | ffaf94459a5042cd0881c7764c267a34aa5b60f0 (diff) |
Move text logic from jni to hwui level
bug:25865834
Change-Id: I2d8c9c9544afcb5ce1784f732aed3e54e0eda372
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; } |