diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index 2364a8c..2cff486 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -38,8 +38,15 @@
     bool onKey(sk_app::Window::Key key, sk_app::Window::InputState state, uint32_t modifiers) override;
     bool onChar(SkUnichar c, uint32_t modifiers) override;
 
-    struct SkPaintFields {
+    struct SkFontFields {
         bool fTypeface = false;
+        bool fTextSize = false;
+        SkScalar fTextSizeRange[2] = { 0, 20 };
+        bool fTextScaleX = false;
+        bool fTextSkewX = false;
+        bool fHinting = false;
+    };
+    struct SkPaintFields {
         bool fPathEffect = false;
         bool fShader = false;
         bool fMaskFilter = false;
@@ -47,10 +54,6 @@
         bool fDrawLooper = false;
         bool fImageFilter = false;
 
-        bool fTextSize = false;
-        SkScalar fTextSizeRange[2] = { 0, 20 };
-        bool fTextScaleX = false;
-        bool fTextSkewX = false;
         bool fColor = false;
         bool fWidth = false;
         bool fMiterLimit = false;
@@ -70,12 +73,9 @@
         const bool fOriginalSkUseDeltaAA = gSkUseDeltaAA;
         const bool fOriginalSkForceDeltaAA = gSkForceDeltaAA;
 
-        bool fTextAlign = false;
         bool fCapType = false;
         bool fJoinType = false;
         bool fStyle = false;
-        bool fTextEncoding = false;
-        bool fHinting = false;
         bool fFilterQuality = false;
     };
 private:
@@ -175,6 +175,8 @@
 
     SkPaint fPaint;
     SkPaintFields fPaintOverrides;
+    SkFont fFont;
+    SkFontFields fFontOverrides;
     bool fPixelGeometryOverrides = false;
 };