commit 713195071dc7bdeddec2d1c9fab9b3720f049f07
author Ben Wagner <bungeman@google.com> Thu Jul 27 10:45:29 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 27 21:30:45 2017 +0000
tree 1bc2d47ec9e66f81a14d626eb5ad8185dbecca27
parent 23890a9ac89005a15967fe8af8aaafc0edda5e32

Remove internal use of SkTypeface::Style.

Change-Id: I71cf04b12be95a54b7fb47d048ba1f8672ed9a8f
Reviewed-on: https://skia-review.googlesource.com/27760
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

gm/filterbitmap.cpp

diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp
index 92aeddc..a630662 100644
--- a/gm/filterbitmap.cpp
+++ b/gm/filterbitmap.cpp
@@ -124,13 +124,13 @@
           paint.setSubpixelText(true);
           paint.setTextSize(fTextSize);
 
-          setTypeface(&paint, "serif", SkFontStyle());
+          setTypeface(&paint, "serif", SkFontStyle::Normal());
           canvas.drawString("Hamburgefons", fTextSize/2, 1.2f*fTextSize, paint);
-          setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold));
+          setTypeface(&paint, "serif", SkFontStyle::Bold());
           canvas.drawString("Hamburgefons", fTextSize/2, 2.4f*fTextSize, paint);
-          setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic));
+          setTypeface(&paint, "serif", SkFontStyle::Italic());
           canvas.drawString("Hamburgefons", fTextSize/2, 3.6f*fTextSize, paint);
-          setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic));
+          setTypeface(&paint, "serif", SkFontStyle::BoldItalic());
           canvas.drawString("Hamburgefons", fTextSize/2, 4.8f*fTextSize, paint);
       }
   private: