diff options
Diffstat (limited to 'gm/filterbitmap.cpp')
| -rw-r--r-- | gm/filterbitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 51a8064d80..ec20e6efbe 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -12,7 +12,7 @@ #include "SkStream.h" #include "SkTypeface.h" -static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) { +static void setTypeface(SkPaint* paint, const char name[], SkFontStyle style) { sk_tool_utils::set_portable_typeface(paint, name, style); } @@ -123,13 +123,13 @@ class FilterBitmapTextGM: public FilterBitmapGM { paint.setSubpixelText(true); paint.setTextSize(fTextSize); - setTypeface(&paint, "serif", SkTypeface::kNormal); + setTypeface(&paint, "serif", SkFontStyle()); canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint); - setTypeface(&paint, "serif", SkTypeface::kBold); + setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold)); canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint); - setTypeface(&paint, "serif", SkTypeface::kItalic); + setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic)); canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint); - setTypeface(&paint, "serif", SkTypeface::kBoldItalic); + setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic)); canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint); } private: |