Revert of Font variations.

src/ports/SkFontHost_FreeType_common.h

 /*
  * Copyright 2006-2012 The Android Open Source Project
  * Copyright 2012 Mozilla Foundation
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SKFONTHOST_FREETYPE_COMMON_H_
 #define SKFONTHOST_FREETYPE_COMMON_H_
@@ skipping 25 matching lines @@
 
 class SkTypeface_FreeType : public SkTypeface {
 public:
     /** For SkFontMgrs to make use of our ability to extract
      *  name and style from a stream, using FreeType's API.
      */
     class Scanner : ::SkNoncopyable {
     public:
         Scanner();
         ~Scanner();
-        struct AxisDefinition {
-            SkFourByteTag fTag;
-            SkFixed fMinimum;
-            SkFixed fDefault;
-            SkFixed fMaximum;
-        };
-        using AxisDefinitions = SkSTArray<4, AxisDefinition, true>;
         bool recognizedFont(SkStream* stream, int* numFonts) const;
         bool scanFont(SkStream* stream, int ttcIndex,
-                      SkString* name, SkFontStyle* style, bool* isFixedPitch,
-                      AxisDefinitions* axes) const;
+                      SkString* name, SkFontStyle* style, bool* isFixedPitch) const;
     private:
         FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const;
         FT_Library fLibrary;
         mutable SkMutex fLibraryMutex;
     };
 
 protected:
     SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch)
         : INHERITED(style, uniqueID, isFixedPitch)
         , fGlyphCount(-1)
@@ skipping 17 matching lines @@
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const override;
 
 private:
     mutable int fGlyphCount;
 
     typedef SkTypeface INHERITED;
 };
 
 #endif // SKFONTHOST_FREETYPE_COMMON_H_