aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/fontcache.cpp
diff options
context:
space:
mode:
authorGravatar mboc <mboc@opera.com>2016-05-31 11:42:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-31 11:42:37 -0700
commitee6a9919a362e16c1d84a870ce867d1ad7b8a141 (patch)
tree971189523fe82821c82a936cafaefd59b76338f7 /gm/fontcache.cpp
parentbfa9275968d11d459b30a485cedcb55c7fecf9d7 (diff)
SkTypeface::MakeFromName to take SkFontStyle.
SkTypeface::MakeFromName currently takes SkTypeface::Style, which is quite limited. This starts the transition to this function taking SkFontStyle instead. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1818043002 TBR=reed He said it sounded like a good idea. Review-Url: https://codereview.chromium.org/1818043002
Diffstat (limited to 'gm/fontcache.cpp')
-rw-r--r--gm/fontcache.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp
index c4af489304..22b29f47ab 100644
--- a/gm/fontcache.cpp
+++ b/gm/fontcache.cpp
@@ -32,8 +32,10 @@ protected:
}
void onOnceBeforeDraw() override {
- fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kItalic);
- fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kItalic);
+ fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif",
+ SkFontStyle::FromOldStyle(SkTypeface::kItalic));
+ fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif",
+ SkFontStyle::FromOldStyle(SkTypeface::kItalic));
}
void onDraw(SkCanvas* canvas) override {