From 1e7c65806f3fbde13b5d8064dc5734d98c32a284 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 21 May 2018 16:10:17 -0400 Subject: drawPosText no longer obeys paint alignment Change-Id: Iac498b54dea4aa1b203d2b9c58e15bb5f2147f82 Reviewed-on: https://skia-review.googlesource.com/129462 Commit-Queue: Herb Derby Reviewed-by: Ben Wagner --- tests/DrawTextTest.cpp | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'tests/DrawTextTest.cpp') diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp index 8dd5917326..ac13140507 100644 --- a/tests/DrawTextTest.cpp +++ b/tests/DrawTextTest.cpp @@ -88,29 +88,25 @@ DEF_TEST(DrawText, reporter) { SkPoint point = SkPoint::Make(25.0f + offsetX, 25.0f + offsetY); - for (int align = 0; align < SkPaint::kAlignCount; ++align) { - paint.setTextAlign(static_cast(align)); + for (unsigned int flags = 0; flags < (1 << 3); ++flags) { + static const unsigned int antiAliasFlag = 1; + static const unsigned int subpixelFlag = 1 << 1; + static const unsigned int lcdFlag = 1 << 2; - for (unsigned int flags = 0; flags < (1 << 3); ++flags) { - static const unsigned int antiAliasFlag = 1; - static const unsigned int subpixelFlag = 1 << 1; - static const unsigned int lcdFlag = 1 << 2; + paint.setAntiAlias(SkToBool(flags & antiAliasFlag)); + paint.setSubpixelText(SkToBool(flags & subpixelFlag)); + paint.setLCDRenderText(SkToBool(flags & lcdFlag)); - paint.setAntiAlias(SkToBool(flags & antiAliasFlag)); - paint.setSubpixelText(SkToBool(flags & subpixelFlag)); - paint.setLCDRenderText(SkToBool(flags & lcdFlag)); + // Test: drawText and drawPosText draw the same. + drawBG(&drawTextCanvas); + drawTextCanvas.drawText(c, 1, point.fX, point.fY, paint); - // Test: drawText and drawPosText draw the same. - drawBG(&drawTextCanvas); - drawTextCanvas.drawText(c, 1, point.fX, point.fY, paint); + drawBG(&drawPosTextCanvas); + drawPosTextCanvas.drawPosText(c, 1, &point, paint); - drawBG(&drawPosTextCanvas); - drawPosTextCanvas.drawPosText(c, 1, &point, paint); - - REPORTER_ASSERT(reporter, - compare(drawTextBitmap, drawTextRect, - drawPosTextBitmap, drawPosTextRect)); - } + REPORTER_ASSERT(reporter, + compare(drawTextBitmap, drawTextRect, + drawPosTextBitmap, drawPosTextRect)); } } } -- cgit v1.2.3