diff options
author | Ben Wagner <bungeman@google.com> | 2018-03-27 18:15:53 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-27 18:16:04 +0000 |
commit | 3560b58de36988e1fba54d9ac341735ab849e913 (patch) | |
tree | bedddd24f268048bf5974914fd9ba81c8d35e018 /gm | |
parent | 83ee463c315851c53f6368fcc3df0a30b0052a57 (diff) |
Revert "Add color fonts."
This reverts commit d3b933f3e03d5c22e9e7c56d2110469e41509720.
Reason for revert: we're not mirroring experimental/ everywhere.
Original change's description:
> Add color fonts.
>
> BUG=skia:7624
>
> Change-Id: I1d0974282adce2fd7b13a003309e63593b6e1a9c
> Reviewed-on: https://skia-review.googlesource.com/109521
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
> Reviewed-on: https://skia-review.googlesource.com/116541
TBR=mtklein@google.com,bungeman@google.com,herb@google.com
Change-Id: Ic2d763244cbce663a23eb53321ac45201c466501
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116680
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/fontmgr.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 58c569c300..a0b2f5b44a 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -9,7 +9,6 @@ #include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkFontMgr.h" -#include "SkPath.h" #include "SkGraphics.h" #include "SkTypeface.h" @@ -225,7 +224,6 @@ public: fontBounds.offset(x, y); SkPaint boundsPaint(glyphPaint); boundsPaint.setColor(boundsColor); - boundsPaint.setStyle(SkPaint::kStroke_Style); canvas->drawRect(fontBounds, boundsPaint); SkPaint::FontMetrics fm; @@ -266,10 +264,6 @@ public: } SkGlyphID str[] = { left, right, top, bottom }; for (size_t i = 0; i < SK_ARRAY_COUNT(str); ++i) { - SkPath path; - glyphPaint.getTextPath(&str[i], sizeof(str[0]), x, y, &path); - SkPaint::Style style = path.isEmpty() ? SkPaint::kFill_Style : SkPaint::kStroke_Style; - glyphPaint.setStyle(style); canvas->drawText(&str[i], sizeof(str[0]), x, y, glyphPaint); } } @@ -288,6 +282,7 @@ protected: paint.setAntiAlias(true); paint.setSubpixelText(true); paint.setTextSize(100); + paint.setStyle(SkPaint::kStroke_Style); paint.setTextScaleX(fScaleX); paint.setTextSkewX(fSkewX); |