diff options
author | 2017-02-23 14:06:12 +0000 | |
---|---|---|
committer | 2017-02-23 14:06:19 +0000 | |
commit | cfd3d9ff8f370e3a4a53e2aba84dc4d682501f4c (patch) | |
tree | 8f896e6e8b99f6c6af930017d6264cb8522553fa /src | |
parent | b16e8ac7f37b30ca9a51367e49c5815f36774120 (diff) |
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 <reed@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkPaint.cpp | 10 | ||||
-rw-r--r-- | src/core/SkTextBlob.cpp | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 568ba6a021..a2dfa73dfa 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -245,6 +245,14 @@ 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)); } @@ -2134,6 +2142,8 @@ 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 817fc62a4a..4065771862 100644 --- a/src/core/SkTextBlob.cpp +++ b/src/core/SkTextBlob.cpp @@ -56,6 +56,8 @@ 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 | |