Revert "Revert "hide nested hinting enum""
This reverts commit 6bd19df9fa9d26d9de4de646b2cdf82ff5dca67c.
Restores original CL, but adds guards for flutter.
Bug: skia:
Change-Id: I380b4ea87d293355026d734249aa2b8c397da144
Reviewed-on: https://skia-review.googlesource.com/c/169345
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index bf779e9..0ced76a 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -359,20 +359,20 @@
fCommands.addCommand('H', "Paint", "Hinting mode", [this]() {
if (!fPaintOverrides.fHinting) {
fPaintOverrides.fHinting = true;
- fPaint.setHinting(SkPaint::kNo_Hinting);
+ fPaint.setHinting(kNo_SkFontHinting);
} else {
- switch (fPaint.getHinting()) {
- case SkPaint::kNo_Hinting:
- fPaint.setHinting(SkPaint::kSlight_Hinting);
+ switch ((SkFontHinting)fPaint.getHinting()) {
+ case kNo_SkFontHinting:
+ fPaint.setHinting(kSlight_SkFontHinting);
break;
- case SkPaint::kSlight_Hinting:
- fPaint.setHinting(SkPaint::kNormal_Hinting);
+ case kSlight_SkFontHinting:
+ fPaint.setHinting(kNormal_SkFontHinting);
break;
- case SkPaint::kNormal_Hinting:
- fPaint.setHinting(SkPaint::kFull_Hinting);
+ case kNormal_SkFontHinting:
+ fPaint.setHinting(kFull_SkFontHinting);
break;
- case SkPaint::kFull_Hinting:
- fPaint.setHinting(SkPaint::kNo_Hinting);
+ case kFull_SkFontHinting:
+ fPaint.setHinting(kNo_SkFontHinting);
fPaintOverrides.fHinting = false;
break;
}
@@ -710,17 +710,17 @@
"Force Autohint", "No Force Autohint");
if (fPaintOverrides.fHinting) {
- switch (fPaint.getHinting()) {
- case SkPaint::kNo_Hinting:
+ switch ((SkFontHinting)fPaint.getHinting()) {
+ case kNo_SkFontHinting:
paintTitle.append("No Hinting");
break;
- case SkPaint::kSlight_Hinting:
+ case kSlight_SkFontHinting:
paintTitle.append("Slight Hinting");
break;
- case SkPaint::kNormal_Hinting:
+ case kNormal_SkFontHinting:
paintTitle.append("Normal Hinting");
break;
- case SkPaint::kFull_Hinting:
+ case kFull_SkFontHinting:
paintTitle.append("Full Hinting");
break;
}
@@ -1614,17 +1614,17 @@
if (ImGui::CollapsingHeader("Paint")) {
int hintingIdx = 0;
if (fPaintOverrides.fHinting) {
- hintingIdx = fPaint.getHinting() + 1;
+ hintingIdx = static_cast<unsigned>(fPaint.getHinting()) + 1;
}
if (ImGui::Combo("Hinting", &hintingIdx,
"Default\0None\0Slight\0Normal\0Full\0\0"))
{
if (hintingIdx == 0) {
fPaintOverrides.fHinting = false;
- fPaint.setHinting(SkPaint::kNo_Hinting);
+ fPaint.setHinting(kNo_SkFontHinting);
} else {
fPaintOverrides.fHinting = true;
- SkPaint::Hinting hinting = SkTo<SkPaint::Hinting>(hintingIdx - 1);
+ SkFontHinting hinting = SkTo<SkFontHinting>(hintingIdx - 1);
fPaint.setHinting(hinting);
}
paramsChanged = true;