diff options
| -rw-r--r-- | libs/hwui/SkiaCanvas.h | 1 | ||||
| -rw-r--r-- | libs/hwui/hwui/Canvas.cpp | 19 | ||||
| -rw-r--r-- | libs/hwui/hwui/Canvas.h | 9 |
3 files changed, 4 insertions, 25 deletions
diff --git a/libs/hwui/SkiaCanvas.h b/libs/hwui/SkiaCanvas.h index ec83a1961eff..1eb089d8764c 100644 --- a/libs/hwui/SkiaCanvas.h +++ b/libs/hwui/SkiaCanvas.h @@ -136,7 +136,6 @@ public: const Paint* paint) override; virtual double drawAnimatedImage(AnimatedImageDrawable* imgDrawable) override; - virtual bool drawTextAbsolutePos() const override { return true; } virtual void drawVectorDrawable(VectorDrawableRoot* vectorDrawable) override; virtual void drawRoundRect(uirenderer::CanvasPropertyPrimitive* left, diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp index b98ffca84dfc..c138a32eacc2 100644 --- a/libs/hwui/hwui/Canvas.cpp +++ b/libs/hwui/hwui/Canvas.cpp @@ -95,18 +95,10 @@ public: void operator()(size_t start, size_t end) { auto glyphFunc = [&](uint16_t* text, float* positions) { - if (canvas->drawTextAbsolutePos()) { - for (size_t i = start, textIndex = 0, posIndex = 0; i < end; i++) { - text[textIndex++] = layout.getGlyphId(i); - positions[posIndex++] = x + layout.getX(i); - positions[posIndex++] = y + layout.getY(i); - } - } else { - for (size_t i = start, textIndex = 0, posIndex = 0; i < end; i++) { - text[textIndex++] = layout.getGlyphId(i); - positions[posIndex++] = layout.getX(i); - positions[posIndex++] = layout.getY(i); - } + for (size_t i = start, textIndex = 0, posIndex = 0; i < end; i++) { + text[textIndex++] = layout.getGlyphId(i); + positions[posIndex++] = x + layout.getX(i); + positions[posIndex++] = y + layout.getY(i); } }; @@ -166,9 +158,6 @@ void Canvas::drawText(const uint16_t* text, int textSize, int start, int count, minikin::MinikinRect bounds; layout.getBounds(&bounds); - if (!drawTextAbsolutePos()) { - bounds.offset(x, y); - } // Set align to left for drawing, as we don't want individual // glyphs centered or right-aligned; the offset above takes diff --git a/libs/hwui/hwui/Canvas.h b/libs/hwui/hwui/Canvas.h index b90a4a3d68e6..27dfed305a94 100644 --- a/libs/hwui/hwui/Canvas.h +++ b/libs/hwui/hwui/Canvas.h @@ -253,15 +253,6 @@ public: virtual void drawPicture(const SkPicture& picture) = 0; /** - * Specifies if the positions passed to ::drawText are absolute or relative - * to the (x,y) value provided. - * - * If true the (x,y) values are ignored. Otherwise, those (x,y) values need - * to be added to each glyph's position to get its absolute position. - */ - virtual bool drawTextAbsolutePos() const = 0; - - /** * Draws a VectorDrawable onto the canvas. */ virtual void drawVectorDrawable(VectorDrawableRoot* tree) = 0; |