aboutsummaryrefslogtreecommitdiffstats
path: root/tests/FontHostTest.cpp
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2018-11-07 19:54:33 -0500
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-11-08 16:33:04 +0000
commit9edbf42e75cb46124ba6410302c93f44c761311d (patch)
tree32fc15b16637d64394bce09356e7749adeaef8d6 /tests/FontHostTest.cpp
parent7d8f82b9b0db075f9f0f9ce55638796cd23edf63 (diff)
downloadplatform_external_skqp-9edbf42e75cb46124ba6410302c93f44c761311d.tar.gz
platform_external_skqp-9edbf42e75cb46124ba6410302c93f44c761311d.tar.bz2
platform_external_skqp-9edbf42e75cb46124ba6410302c93f44c761311d.zip
Revert[4] "hide nested hinting enum"
This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/FontHostTest.cpp')
-rw-r--r--tests/FontHostTest.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index fc1b53d81c..39ebcc7cb7 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -249,18 +249,18 @@ static void test_advances(skiatest::Reporter* reporter) {
};
static const struct {
- SkPaint::Hinting hinting;
- unsigned flags;
+ SkFontHinting hinting;
+ unsigned flags;
} settings[] = {
- { SkPaint::kNo_Hinting, 0 },
- { SkPaint::kNo_Hinting, SkPaint::kLinearText_Flag },
- { SkPaint::kNo_Hinting, SkPaint::kSubpixelText_Flag },
- { SkPaint::kSlight_Hinting, 0 },
- { SkPaint::kSlight_Hinting, SkPaint::kLinearText_Flag },
- { SkPaint::kSlight_Hinting, SkPaint::kSubpixelText_Flag },
- { SkPaint::kNormal_Hinting, 0 },
- { SkPaint::kNormal_Hinting, SkPaint::kLinearText_Flag },
- { SkPaint::kNormal_Hinting, SkPaint::kSubpixelText_Flag },
+ { kNo_SkFontHinting, 0 },
+ { kNo_SkFontHinting, SkPaint::kLinearText_Flag },
+ { kNo_SkFontHinting, SkPaint::kSubpixelText_Flag },
+ { kSlight_SkFontHinting, 0 },
+ { kSlight_SkFontHinting, SkPaint::kLinearText_Flag },
+ { kSlight_SkFontHinting, SkPaint::kSubpixelText_Flag },
+ { kNormal_SkFontHinting, 0 },
+ { kNormal_SkFontHinting, SkPaint::kLinearText_Flag },
+ { kNormal_SkFontHinting, SkPaint::kSubpixelText_Flag },
};
static const struct {