From dfe0647f6c7a80242f1646541a6f3460e0ef3c76 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 23 Feb 2017 14:30:18 -0500 Subject: [PATCH] Fix unit test that failed due to incorrect refactor. Test: hwui unit tests Change-Id: I88b962718086ff1ca3df1999b2040fb1007b6f33 --- libs/hwui/tests/unit/RecordingCanvasTests.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp index f48d98ce4934a..b2ea9accf63af 100644 --- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp +++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp @@ -201,8 +201,16 @@ OPENGL_PIPELINE_TEST(RecordingCanvas, drawGlyphs_strikeThruAndUnderline) { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { uint32_t flags = paint.getFlags(); - if (i != 0) flags |= SkPaint::kUnderlineText_ReserveFlag; - if (j != 0) flags |= SkPaint::kStrikeThruText_ReserveFlag; + if (i != 0) { + flags |= SkPaint::kUnderlineText_ReserveFlag; + } else { + flags &= ~SkPaint::kUnderlineText_ReserveFlag; + } + if (j != 0) { + flags |= SkPaint::kStrikeThruText_ReserveFlag; + } else { + flags &= ~SkPaint::kStrikeThruText_ReserveFlag; + } paint.setFlags(flags); TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); }