diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-07-27 10:45:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-27 21:30:45 +0000 |
| commit | 713195071dc7bdeddec2d1c9fab9b3720f049f07 (patch) | |
| tree | 1bc2d47ec9e66f81a14d626eb5ad8185dbecca27 /samplecode/SampleFontScalerTest.cpp | |
| parent | 23890a9ac89005a15967fe8af8aaafc0edda5e32 (diff) | |
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>
Diffstat (limited to 'samplecode/SampleFontScalerTest.cpp')
| -rw-r--r-- | samplecode/SampleFontScalerTest.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp index 2b4a46d00c..b41166d38e 100644 --- a/samplecode/SampleFontScalerTest.cpp +++ b/samplecode/SampleFontScalerTest.cpp @@ -5,32 +5,33 @@ * found in the LICENSE file. */ #include "SampleCode.h" -#include "SkView.h" +#include "Sk1DPathEffect.h" #include "SkCanvas.h" -#include "SkTypeface.h" +#include "SkColorFilter.h" +#include "SkColorPriv.h" +#include "SkCornerPathEffect.h" +#include "SkDither.h" +#include "SkFontStyle.h" #include "SkPath.h" +#include "SkPathMeasure.h" +#include "SkRandom.h" #include "SkRegion.h" #include "SkShader.h" +#include "SkTypeface.h" #include "SkUtils.h" -#include "Sk1DPathEffect.h" -#include "SkCornerPathEffect.h" -#include "SkPathMeasure.h" -#include "SkRandom.h" -#include "SkColorPriv.h" -#include "SkColorFilter.h" -#include "SkDither.h" +#include "SkView.h" -static const struct { +static constexpr struct { const char* fName; - SkTypeface::Style fStyle; + SkFontStyle fStyle; } gFaces[] = { - { nullptr, SkTypeface::kNormal }, - { nullptr, SkTypeface::kBold }, - { "serif", SkTypeface::kNormal }, - { "serif", SkTypeface::kBold }, - { "serif", SkTypeface::kItalic }, - { "serif", SkTypeface::kBoldItalic }, - { "monospace", SkTypeface::kNormal } + { nullptr, SkFontStyle::Normal() }, + { nullptr, SkFontStyle::Bold() }, + { "serif", SkFontStyle::Normal() }, + { "serif", SkFontStyle::Bold() }, + { "serif", SkFontStyle::Italic() }, + { "serif", SkFontStyle::BoldItalic() }, + { "monospace", SkFontStyle::Normal() } }; static const int gFaceCount = SK_ARRAY_COUNT(gFaces); @@ -41,8 +42,7 @@ class FontScalerTestView : public SampleView { public: FontScalerTestView() { for (int i = 0; i < gFaceCount; i++) { - fFaces[i] = SkTypeface::MakeFromName( - gFaces[i].fName, SkFontStyle::FromOldStyle(gFaces[i].fStyle)); + fFaces[i] = SkTypeface::MakeFromName(gFaces[i].fName, gFaces[i].fStyle); } } |