SkPDF: refactor & code cleanup ahead of https://crrev.com/2322403002

src/pdf/SkPDFFont.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 SkPDFFont_DEFINED
 #define SkPDFFont_DEFINED
@@ skipping 22 matching lines @@
     /** Returns the typeface represented by this class. Returns nullptr for the
      *  default typeface.
      */
     SkTypeface* typeface() const { return fTypeface.get(); }
 
     /** Returns the font type represented in this font.  For Type0 fonts,
      *  returns the type of the decendant font.
      */
     SkAdvancedTypefaceMetrics::FontType getType() const { return fFontType; }
 
+    static SkAdvancedTypefaceMetrics::FontType FontType(const SkAdvancedTypefaceMetrics&);
+
     static bool IsMultiByte(SkAdvancedTypefaceMetrics::FontType type) {
         return type == SkAdvancedTypefaceMetrics::kType1CID_Font ||
                type == SkAdvancedTypefaceMetrics::kTrueType_Font;
     }
 
     /** Returns true if this font encoding supports glyph IDs above 255.
      */
     bool multiByteGlyphs() const { return SkPDFFont::IsMultiByte(this->getType()); }
 
     /** Return true if this font has an encoding for the passed glyph id.
      */
     bool hasGlyph(SkGlyphID gid) {
         return (gid >= fFirstGlyphID && gid <= fLastGlyphID) || gid == 0;
     }
 
     /** Convert the input glyph ID into the font encoding.  */
     SkGlyphID glyphToPDFFontEncoding(SkGlyphID gid) const {
         if (this->multiByteGlyphs() || gid == 0) {
             return gid;
         }
         SkASSERT(gid >= fFirstGlyphID && gid <= fLastGlyphID);
         SkASSERT(fFirstGlyphID > 0);
         return gid - fFirstGlyphID + 1;
     }
 
-    /** Count the number of glyphIDs that can be encoded with this font.
-     *  glyphIDs > maxGlyphID are considered okay. */
-    int countStretch(const SkGlyphID* glyphIDs,
-                     int numGlyphs,
-                     SkGlyphID maxGlyphID) const {
-        if (this->multiByteGlyphs()) {
-            return numGlyphs;
-        }
-        for (int i = 0; i < numGlyphs; i++) {
-            SkGlyphID gid = glyphIDs[i];
-            if (gid != 0 && gid <= maxGlyphID &&
-                (gid < fFirstGlyphID || gid > fLastGlyphID)) {
-                return i;
-            }
-        }
-        return numGlyphs;
-    }
-
     void noteGlyphUsage(SkGlyphID glyph) {
         SkASSERT(this->hasGlyph(glyph));
         fGlyphUsage.set(glyph);
     }
 
     /** Get the font resource for the passed typeface and glyphID. The
      *  reference count of the object is incremented and it is the caller's
      *  responsibility to unreference it when done.  This is needed to
      *  accommodate the weak reference pattern used when the returned object
      *  is new and has no other references.
@@ skipping 47 matching lines @@
     // The glyph IDs accessible with this font.  For Type1 (non CID) fonts,
     // this will be a subset if the font has more than 255 glyphs.
     const SkGlyphID fFirstGlyphID;
     const SkGlyphID fLastGlyphID;
     const SkAdvancedTypefaceMetrics::FontType fFontType;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif