From bcfb8f639e516b673b6dbda41900efac69be2daf Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 23 Feb 2017 14:19:35 +0000 Subject: Revert "Revert "Revert[2] "hide deprecated underline and strikethru""" This reverts commit cfd3d9ff8f370e3a4a53e2aba84dc4d682501f4c. Reason for revert: derek is fixing caller Original change's description: > Revert "Revert[2] "hide deprecated underline and strikethru"" > > This reverts commit aab68c56ef8fc88b0d1536f99aa1cc9ae7a0573a. > > Reason for revert: android still broken RecordingCanvasTests.cpp > > Original change's description: > > Revert[2] "hide deprecated underline and strikethru" > > > > android now updated. > > > > This reverts commit e005edd3a5deb602beec59f59cdc8b14d3764d58. > > > > BUG=skia:6250 > > > > Change-Id: If08d344cdd863fde1d9955dc3fab671a83be0f73 > > Reviewed-on: https://skia-review.googlesource.com/8815 > > Commit-Queue: Mike Reed > > Reviewed-by: Mike Reed > > > > TBR=reed@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia:6250 > > Change-Id: I954575a0e4b9aca8414e10901a7be03a2d7e6396 > Reviewed-on: https://skia-review.googlesource.com/8900 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed > TBR=reviews@skia.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6250 Change-Id: Ie518b64219a0262cd343644754940774bf42faec Reviewed-on: https://skia-review.googlesource.com/8901 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- src/core/SkPaint.cpp | 10 ---------- src/core/SkTextBlob.cpp | 2 -- 2 files changed, 12 deletions(-) (limited to 'src') diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index a2dfa73dfa..568ba6a021 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -245,14 +245,6 @@ void SkPaint::setVerticalText(bool doVertical) { this->setFlags(set_clear_mask(fBitfields.fFlags, doVertical, kVerticalText_Flag)); } -void SkPaint::setUnderlineText(bool doUnderline) { - this->setFlags(set_clear_mask(fBitfields.fFlags, doUnderline, kUnderlineText_Flag)); -} - -void SkPaint::setStrikeThruText(bool doStrikeThru) { - this->setFlags(set_clear_mask(fBitfields.fFlags, doStrikeThru, kStrikeThruText_Flag)); -} - void SkPaint::setFakeBoldText(bool doFakeBold) { this->setFlags(set_clear_mask(fBitfields.fFlags, doFakeBold, kFakeBoldText_Flag)); } @@ -2142,8 +2134,6 @@ void SkPaint::toString(SkString* str) const { bool needSeparator = false; SkAddFlagToString(str, this->isAntiAlias(), "AntiAlias", &needSeparator); SkAddFlagToString(str, this->isDither(), "Dither", &needSeparator); - SkAddFlagToString(str, this->isUnderlineText(), "UnderlineText", &needSeparator); - SkAddFlagToString(str, this->isStrikeThruText(), "StrikeThruText", &needSeparator); SkAddFlagToString(str, this->isFakeBoldText(), "FakeBoldText", &needSeparator); SkAddFlagToString(str, this->isLinearText(), "LinearText", &needSeparator); SkAddFlagToString(str, this->isSubpixelText(), "SubpixelText", &needSeparator); diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp index 4065771862..817fc62a4a 100644 --- a/src/core/SkTextBlob.cpp +++ b/src/core/SkTextBlob.cpp @@ -56,8 +56,6 @@ public: private: const static uint32_t kFlagsMask = SkPaint::kAntiAlias_Flag | - SkPaint::kUnderlineText_Flag | - SkPaint::kStrikeThruText_Flag | SkPaint::kFakeBoldText_Flag | SkPaint::kLinearText_Flag | SkPaint::kSubpixelText_Flag | -- cgit v1.2.3