SkPDF: Hold page objects, not SkPDFDevices.

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
@@ skipping 28 matching lines @@
     struct FontGlyphSetPair {
         FontGlyphSetPair(SkPDFFont* font, SkPDFGlyphSet* glyphSet);
 
         SkPDFFont* fFont;
         SkPDFGlyphSet* fGlyphSet;
     };
 
     SkPDFGlyphSetMap();
     ~SkPDFGlyphSetMap();
 
-    class F2BIter {
-    public:
-        explicit F2BIter(const SkPDFGlyphSetMap& map);
-        const FontGlyphSetPair* next() const;
-        void reset(const SkPDFGlyphSetMap& map);
-
-    private:
-        const SkTDArray<FontGlyphSetPair>* fMap;
-        mutable int fIndex;
-    };
+    const FontGlyphSetPair* begin() const { return fMap.begin(); }
+    const FontGlyphSetPair* end() const { return fMap.end(); }
 
     void merge(const SkPDFGlyphSetMap& usage);
     void reset();
 
     void noteGlyphUsage(SkPDFFont* font, const uint16_t* glyphIDs,
                         int numGlyphs);
 
 private:
     SkPDFGlyphSet* getGlyphSetForFont(SkPDFFont* font);
 
@@ skipping 135 matching lines @@
     uint16_t fLastGlyphID;
     sk_sp<const SkAdvancedTypefaceMetrics> fFontInfo;
     sk_sp<SkPDFDict> fDescriptor;
 
     SkAdvancedTypefaceMetrics::FontType fFontType;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif