Revert "Add color fonts."

This reverts commit c912d6133c66df7cde3d64adc76941856a12da64.

Reason for revert: Causing TSAN issues.

Original change's description:
> Add color fonts.
> 
> BUG=skia:7624
> 
> Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
> 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>

TBR=mtklein@google.com,bungeman@google.com,herb@google.com

Change-Id: I2ccd1f00e91bb92b7059323c95da0dd3de954164
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116141
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

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);