From 713195071dc7bdeddec2d1c9fab9b3720f049f07 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 27 Jul 2017 10:45:29 -0400 Subject: Remove internal use of SkTypeface::Style. Change-Id: I71cf04b12be95a54b7fb47d048ba1f8672ed9a8f Reviewed-on: https://skia-review.googlesource.com/27760 Commit-Queue: Ben Wagner Reviewed-by: Mike Klein --- bench/SkGlyphCacheBench.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'bench/SkGlyphCacheBench.cpp') diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp index 4d43a611d4..1cc257fd3f 100644 --- a/bench/SkGlyphCacheBench.cpp +++ b/bench/SkGlyphCacheBench.cpp @@ -56,8 +56,7 @@ protected: 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 @@ protected: size_t oldCacheLimitSize = SkGraphics::GetFontCacheLimit(); SkGraphics::SetFontCacheLimit(fCacheSize); sk_sp 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) { -- cgit v1.2.3