Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove a dead option"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-30 00:32:02 +00:00
committed by Android (Google) Code Review
parent 75641038d8 2afc3b0a00
commit 59e43a98f8
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/SkiaCanvas.h
View File

@@ -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,

19
libs/hwui/hwui/Canvas.cpp
View File

@@ -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

9
libs/hwui/hwui/Canvas.h
View File

@@ -252,15 +252,6 @@ public:
virtual double drawAnimatedImage(AnimatedImageDrawable* imgDrawable) = 0;
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.
*/