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>

bench/SkGlyphCacheBench.cpp

diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp
index 4d43a61..1cc257f 100644
--- a/bench/SkGlyphCacheBench.cpp
+++ b/bench/SkGlyphCacheBench.cpp
@@ -56,8 +56,7 @@
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
-        paint.setTypeface(sk_tool_utils::create_portable_typeface(
-                              "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic)));
+        paint.setTypeface(sk_tool_utils::create_portable_typeface("serif", SkFontStyle::Italic()));
 
         for (int work = 0; work < loops; work++) {
             do_font_stuff(&paint);
@@ -89,10 +88,8 @@
         size_t oldCacheLimitSize = SkGraphics::GetFontCacheLimit();
         SkGraphics::SetFontCacheLimit(fCacheSize);
         sk_sp<SkTypeface> typefaces[] =
-            {sk_tool_utils::create_portable_typeface("serif",
-                  SkFontStyle::FromOldStyle(SkTypeface::kItalic)),
-             sk_tool_utils::create_portable_typeface("sans-serif",
-                  SkFontStyle::FromOldStyle(SkTypeface::kItalic))};
+            {sk_tool_utils::create_portable_typeface("serif", SkFontStyle::Italic()),
+             sk_tool_utils::create_portable_typeface("sans-serif", SkFontStyle::Italic())};
 
         for (int work = 0; work < loops; work++) {
             SkTaskGroup().batch(16, [&](int threadIndex) {