From e005edd3a5deb602beec59f59cdc8b14d3764d58 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Fri, 17 Feb 2017 22:48:51 +0000 Subject: Revert "hide deprecated underline and strikethru" This reverts commit a01bf9ab748836fc4bf271bd5024151bf1ce2e88. Reason for revert: Breaking Android merge. They access setUnderlineText on their subclass of SkPaint. Original change's description: > hide deprecated underline and strikethru > > BUG=skia:6250 > > Change-Id: I85395e4960b16ab91237a74ff35e5b7588965512 > Reviewed-on: https://skia-review.googlesource.com/8600 > Reviewed-by: Ben Wagner > Commit-Queue: Mike Reed > TBR=bungeman@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6250 Change-Id: If55f69f061dc4439ca2faa62807a9c5694ebbeb4 Reviewed-on: https://skia-review.googlesource.com/8687 Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- tests/TextBlobTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/TextBlobTest.cpp') diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp index 09389a4b52..dafbe74e69 100644 --- a/tests/TextBlobTest.cpp +++ b/tests/TextBlobTest.cpp @@ -186,6 +186,8 @@ public: font.setTextAlign(SkPaint::kCenter_Align); font.setHinting(SkPaint::kFull_Hinting); font.setAntiAlias(true); + font.setUnderlineText(true); + font.setStrikeThruText(true); font.setFakeBoldText(true); font.setLinearText(true); font.setSubpixelText(true); @@ -205,6 +207,8 @@ public: REPORTER_ASSERT(reporter, defaultPaint.getTextAlign() != font.getTextAlign()); REPORTER_ASSERT(reporter, defaultPaint.getHinting() != font.getHinting()); REPORTER_ASSERT(reporter, defaultPaint.isAntiAlias() != font.isAntiAlias()); + REPORTER_ASSERT(reporter, defaultPaint.isUnderlineText() != font.isUnderlineText()); + REPORTER_ASSERT(reporter, defaultPaint.isStrikeThruText() != font.isStrikeThruText()); REPORTER_ASSERT(reporter, defaultPaint.isFakeBoldText() != font.isFakeBoldText()); REPORTER_ASSERT(reporter, defaultPaint.isLinearText() != font.isLinearText()); REPORTER_ASSERT(reporter, defaultPaint.isSubpixelText() != font.isSubpixelText()); @@ -234,6 +238,8 @@ public: REPORTER_ASSERT(reporter, paint.getTextAlign() == font.getTextAlign()); REPORTER_ASSERT(reporter, paint.getHinting() == font.getHinting()); REPORTER_ASSERT(reporter, paint.isAntiAlias() == font.isAntiAlias()); + REPORTER_ASSERT(reporter, paint.isUnderlineText() == font.isUnderlineText()); + REPORTER_ASSERT(reporter, paint.isStrikeThruText() == font.isStrikeThruText()); REPORTER_ASSERT(reporter, paint.isFakeBoldText() == font.isFakeBoldText()); REPORTER_ASSERT(reporter, paint.isLinearText() == font.isLinearText()); REPORTER_ASSERT(reporter, paint.isSubpixelText() == font.isSubpixelText()); -- cgit v1.2.3