commit 2e3f9d8a9309686eeb4c76ccfde5800da87a68b3
author halcanary <halcanary@google.com> Fri Feb 27 12:41:03 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 27 12:41:03 2015 -0800
tree d4a9837f39b384086705102850610a515e2c5e74
parent 4f569beac777afde2f2dd9079a52535f8e7519b3

PDF: Canon now owns a reference to all interned objects

Add SkPDFCanon::reset function to unref all objects.

No longer possible to remove object from canon

Motivation: this doesn't change these object's lifetime, (they will
still be fully unrefed when SkDocument::close() is called, but we no
longer have to remove them from the array when their destructor is
called.

Review URL: https://codereview.chromium.org/966863002

src/pdf/SkPDFFontImpl.h

diff --git a/src/pdf/SkPDFFontImpl.h b/src/pdf/SkPDFFontImpl.h
index 4c3e525..a0689a3 100644
--- a/src/pdf/SkPDFFontImpl.h
+++ b/src/pdf/SkPDFFontImpl.h
@@ -28,8 +28,7 @@
     typedef SkPDFDict INHERITED;
 #endif
 
-    SkPDFType0Font(SkPDFCanon* canon,
-                   const SkAdvancedTypefaceMetrics* info,
+    SkPDFType0Font(const SkAdvancedTypefaceMetrics* info,
                    SkTypeface* typeface);
 
     bool populate(const SkPDFGlyphSet* subset);
@@ -43,8 +42,7 @@
 private:
     friend class SkPDFType0Font;  // to access the constructor
 
-    SkPDFCIDFont(SkPDFCanon* canon,
-                 const SkAdvancedTypefaceMetrics* info,
+    SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info,
                  SkTypeface* typeface,
                  const SkPDFGlyphSet* subset);
 
@@ -61,8 +59,7 @@
 private:
     friend class SkPDFFont;  // to access the constructor
 
-    SkPDFType1Font(SkPDFCanon* canon,
-                   const SkAdvancedTypefaceMetrics* info,
+    SkPDFType1Font(const SkAdvancedTypefaceMetrics* info,
                    SkTypeface* typeface,
                    uint16_t glyphID,
                    SkPDFDict* relatedFontDescriptor);
@@ -81,8 +78,7 @@
 private:
     friend class SkPDFFont;  // to access the constructor
 
-    SkPDFType3Font(SkPDFCanon* canon,
-                   const SkAdvancedTypefaceMetrics* info,
+    SkPDFType3Font(const SkAdvancedTypefaceMetrics* info,
                    SkTypeface* typeface,
                    uint16_t glyphID);