diff options
author | 2011-12-05 11:56:09 -0800 | |
---|---|---|
committer | 2011-12-05 11:56:09 -0800 | |
commit | 7da48db9c5c071cfc1c54a3709a02c1300dccd76 (patch) | |
tree | 960648b93566fe5b23dac29d39137f0c03378383 /libs/hwui/OpenGLRenderer.cpp | |
parent | 315e468763c9601e2f06443fda847d2c9eb27a75 (diff) | |
parent | 8f9a9f61ab793d9387a5942b307e74324704893b (diff) |
Merge "Clip text correctly Bug #5706056"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index a60ac0804af4..81c053e3265f 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2069,16 +2069,7 @@ void OpenGLRenderer::drawText(const char* text, int bytesCount, int count, } if (mSnapshot->isIgnored()) return; - // TODO: We should probably make a copy of the paint instead of modifying - // it; modifying the paint will change its generationID the first - // time, which might impact caches. More investigation needed to - // see if it matters. - // If we make a copy, then drawTextDecorations() should *not* make - // its own copy as it does right now. - paint->setAntiAlias(true); -#if RENDER_TEXT_AS_GLYPHS - paint->setTextEncoding(SkPaint::kGlyphID_TextEncoding); -#endif + // NOTE: AA and glyph id encoding are set in DisplayListRenderer.cpp switch (paint->getTextAlign()) { case SkPaint::kCenter_Align: @@ -2095,6 +2086,7 @@ void OpenGLRenderer::drawText(const char* text, int bytesCount, int count, SkPaint::FontMetrics metrics; paint->getFontMetrics(&metrics, 0.0f); + // If no length was specified, just perform the hit test on the Y axis if (quickReject(x, y + metrics.fTop, x + (length >= 0.0f ? length : INT_MAX / 2), y + metrics.fBottom)) { return; |