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