diff options
| author |  mboc <mboc@opera.com> | 2016-05-31 11:42:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-31 11:42:37 -0700 |
| commit | ee6a9919a362e16c1d84a870ce867d1ad7b8a141 (patch) | |
| tree | 971189523fe82821c82a936cafaefd59b76338f7 /tests/TypefaceTest.cpp | |
| parent | bfa9275968d11d459b30a485cedcb55c7fecf9d7 (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 'tests/TypefaceTest.cpp')
| -rw-r--r-- | tests/TypefaceTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 6a606d4e95..13196bca48 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -12,7 +12,7 @@ DEF_TEST(Typeface, reporter) { - sk_sp<SkTypeface> t1(SkTypeface::MakeFromName(nullptr, SkTypeface::kNormal)); + sk_sp<SkTypeface> t1(SkTypeface::MakeFromName(nullptr, SkFontStyle())); sk_sp<SkTypeface> t2(SkTypeface::MakeDefault(SkTypeface::kNormal)); REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), t2.get())); @@ -22,7 +22,7 @@ DEF_TEST(Typeface, reporter) { REPORTER_ASSERT(reporter, SkTypeface::Equal(t2.get(), 0)); #ifdef SK_BUILD_FOR_ANDROID - sk_sp<SkTypeface> t3(SkTypeface::MakeFromName("non-existent-font", SkTypeface::kNormal)); + sk_sp<SkTypeface> t3(SkTypeface::MakeFromName("non-existent-font", SkFontStyle())); REPORTER_ASSERT(reporter, nullptr == t3); #endif } |