SkPDF: Hold page objects, not SkPDFDevices.

src/pdf/SkPDFFont.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "SkData.h"
@@ skipping 646 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SkPDFGlyphSetMap
 ///////////////////////////////////////////////////////////////////////////////
 SkPDFGlyphSetMap::FontGlyphSetPair::FontGlyphSetPair(SkPDFFont* font,
                                                      SkPDFGlyphSet* glyphSet)
         : fFont(font),
           fGlyphSet(glyphSet) {
 }
 
-SkPDFGlyphSetMap::F2BIter::F2BIter(const SkPDFGlyphSetMap& map) {
-    reset(map);
-}
-
-const SkPDFGlyphSetMap::FontGlyphSetPair* SkPDFGlyphSetMap::F2BIter::next() const {
-    if (fIndex >= fMap->count()) {
-        return nullptr;
-    }
-    return &((*fMap)[fIndex++]);
-}
-
-void SkPDFGlyphSetMap::F2BIter::reset(const SkPDFGlyphSetMap& map) {
-    fMap = &(map.fMap);
-    fIndex = 0;
-}
-
 SkPDFGlyphSetMap::SkPDFGlyphSetMap() {
 }
 
 SkPDFGlyphSetMap::~SkPDFGlyphSetMap() {
     reset();
 }
 
 void SkPDFGlyphSetMap::merge(const SkPDFGlyphSetMap& usage) {
     for (int i = 0; i < usage.fMap.count(); ++i) {
         SkPDFGlyphSet* myUsage = getGlyphSetForFont(usage.fMap[i].fFont);
@@ skipping 741 matching lines @@
     }
     return *canon->fCanEmbedTypeface.set(id, canEmbed);
 }
 
 void SkPDFFont::drop() {
     fTypeface = nullptr;
     fFontInfo = nullptr;
     fDescriptor = nullptr;
     this->SkPDFDict::drop();
 }