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 /samplecode/SampleXfermodesBlur.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 'samplecode/SampleXfermodesBlur.cpp')
| -rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index 8a69f000f8..ef25114cf0 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -28,7 +28,7 @@ #include "SkBlurMaskFilter.h" static void setNamedTypeface(SkPaint* paint, const char name[]) { - paint->setTypeface(SkTypeface::MakeFromName(name, SkTypeface::kNormal)); + paint->setTypeface(SkTypeface::MakeFromName(name, SkFontStyle())); } static uint16_t gBG[] = { 0xFFFF, 0xCCCF, 0xCCCF, 0xFFFF }; @@ -90,7 +90,7 @@ protected: SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(50); - paint.setTypeface(SkTypeface::MakeFromName("Arial Unicode MS", SkTypeface::kNormal)); + paint.setTypeface(SkTypeface::MakeFromName("Arial Unicode MS", SkFontStyle())); char buffer[10]; size_t len = SkUTF8_FromUnichar(0x8500, buffer); canvas->drawText(buffer, len, 40, 40, paint); |