SkPDF/SkAdvancedTypefaceMetrics: simplify ATM, PDF takes over

src/pdf/SkPDFFontImpl.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFFontImpl_DEFINED
 #define SkPDFFontImpl_DEFINED
@@ skipping 34 matching lines @@
 
     SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info,
                  SkTypeface* typeface,
                  const SkPDFGlyphSet* subset);
 
     bool populate(const SkPDFGlyphSet* subset);
     bool addFontDescriptor(int16_t defaultWidth,
                            const SkTDArray<uint32_t>* subset);
 };
 
+struct AdvanceMetric;
+
 class SkPDFType1Font final : public SkPDFFont {
 public:
     virtual ~SkPDFType1Font();
     virtual bool multiByteGlyphs() const { return false; }
 
 private:
     friend class SkPDFFont;  // to access the constructor
 
     SkPDFType1Font(const SkAdvancedTypefaceMetrics* info,
                    SkTypeface* typeface,
                    uint16_t glyphID,
                    SkPDFDict* relatedFontDescriptor);
 
     bool populate(int16_t glyphID);
     bool addFontDescriptor(int16_t defaultWidth);
     void addWidthInfoFromRange(int16_t defaultWidth,
-        const SkAdvancedTypefaceMetrics::WidthRange* widthRangeEntry);
+        const AdvanceMetric* widthRangeEntry);
 };
 
 class SkPDFType3Font final : public SkPDFFont {
 public:
     virtual ~SkPDFType3Font();
     virtual bool multiByteGlyphs() const { return false; }
 
 private:
     friend class SkPDFFont;  // to access the constructor
 
     SkPDFType3Font(const SkAdvancedTypefaceMetrics* info,
                    SkTypeface* typeface,
                    uint16_t glyphID);
 
     bool populate(uint16_t glyphID);
 };
 
 #endif