Deduplicate axis value resolving code.

src/ports/SkFontMgr_android_parser.h

 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_android_parser_DEFINED
 #define SkFontMgr_android_parser_DEFINED
 
-#include "SkFixed.h"
+#include "SkFontMgr.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkTypes.h"
 
 #include <climits>
 #include <limits>
 
 /** \class SkLanguage
 
@@ skipping 44 matching lines @@
 typedef uint32_t FontVariant;
 
 // Must remain trivially movable (can be memmoved).
 struct FontFileInfo {
     FontFileInfo() : fIndex(0), fWeight(0), fStyle(Style::kAuto) { }
 
     SkString fFileName;
     int fIndex;
     int fWeight;
     enum class Style { kAuto, kNormal, kItalic } fStyle;
-    struct Axis {
-        Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { }
-        SkFourByteTag fTag;
-        SkFixed fValue;
-    };
-    SkTArray<Axis, true> fAxes;
+    SkTArray<SkFontMgr::FontParameters::Axis, true> fAxes;
 };
 
 /**
  * A font family provides one or more names for a collection of fonts, each of
  * which has a different style (normal, italic) or weight (thin, light, bold,
  * etc).
  * Some fonts may occur in compact variants for use in the user interface.
  * Android distinguishes "fallback" fonts to support non-ASCII character sets.
  */
 struct FontFamily {
@@ skipping 117 matching lines @@
     }
     if (negate) {
         n = -n;
         frac = -frac;
     }
     *value = SkLeftShift(n, N) + frac;
     return true;
 }
 
 #endif /* SkFontMgr_android_parser_DEFINED */