diff options
| author |  Herb Derby <herb@google.com> | 2018-05-21 16:10:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-21 21:53:54 +0000 |
| commit | 1e7c65806f3fbde13b5d8064dc5734d98c32a284 (patch) | |
| tree | e758fae7c14f09ba185b8aaa8f8306dad5cd4905 /src/core/SkDraw.cpp | |
| parent | 4bfb50b904e0e92d10145398eb3a6f8dd7868867 (diff) | |
drawPosText no longer obeys paint alignment
Change-Id: Iac498b54dea4aa1b203d2b9c58e15bb5f2147f82
Reviewed-on: https://skia-review.googlesource.com/129462
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/core/SkDraw.cpp')
| -rw-r--r-- | src/core/SkDraw.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 7e526e6098..b7150f85f8 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1590,7 +1590,6 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength, const SkS paint, props, this->scalerContextFlags(), nullptr); const char* stop = text + byteLength; - SkTextAlignProc alignProc(paint.getTextAlign()); SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition); // Now restore the original settings, so we "draw" with whatever style/stroking. @@ -1602,10 +1601,8 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength, const SkS if (glyph.fWidth) { const SkPath* path = cache->findPath(glyph); if (path) { - SkPoint tmsLoc; - tmsProc(pos, &tmsLoc); SkPoint loc; - alignProc(tmsLoc, glyph, &loc); + tmsProc(pos, &loc); matrix[SkMatrix::kMTransX] = loc.fX; matrix[SkMatrix::kMTransY] = loc.fY; @@ -1641,11 +1638,10 @@ void SkDraw::drawPosText(const char text[], size_t byteLength, const SkScalar po SkAutoBlitterChoose blitterChooser(*this, nullptr, paint); SkAAClipBlitterWrapper wrapper(*fRC, blitterChooser.get()); DrawOneGlyph drawOneGlyph(*this, paint, cache.get(), wrapper.getBlitter()); - SkPaint::Align textAlignment = paint.getTextAlign(); SkFindAndPlaceGlyph::ProcessPosText( paint.getTextEncoding(), text, byteLength, - offset, *fMatrix, pos, scalarsPerPosition, textAlignment, cache.get(), drawOneGlyph); + offset, *fMatrix, pos, scalarsPerPosition, cache.get(), drawOneGlyph); } #if defined _WIN32 |