PDF: Canon now owns a reference to all interned objects

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 132 matching lines @@
         kRelated_Match,
         kNot_Match,
     };
     static Match IsMatch(SkPDFFont* existingFont,
                          uint32_t existingFontID,
                          uint16_t existingGlyphID,
                          uint32_t searchFontID,
                          uint16_t searchGlyphID);
 
 protected:
-    SkPDFCanon* const fCanon;
-
     // Common constructor to handle common members.
-    SkPDFFont(SkPDFCanon* canon,
-              const SkAdvancedTypefaceMetrics* fontInfo,
+    SkPDFFont(const SkAdvancedTypefaceMetrics* fontInfo,
               SkTypeface* typeface,
               SkPDFDict* relatedFontDescriptor);
 
     // Accessors for subclass.
     const SkAdvancedTypefaceMetrics* fontInfo();
     void setFontInfo(const SkAdvancedTypefaceMetrics* info);
     uint16_t firstGlyphID() const;
     uint16_t lastGlyphID() const;
     void setLastGlyphID(uint16_t glyphID);
 
@@ skipping 31 matching lines @@
     uint16_t fLastGlyphID;
     SkAutoTUnref<const SkAdvancedTypefaceMetrics> fFontInfo;
     SkAutoTUnref<SkPDFDict> fDescriptor;
 
     SkAdvancedTypefaceMetrics::FontType fFontType;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif