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

1 files changed, 3 insertions, 6 deletions

diff --git a/src/pdf/SkPDFShader.h b/src/pdf/SkPDFShader.h
index 5be47a382f..4fdbc44cf7 100644
--- a/src/pdf/SkPDFShader.h
+++ b/src/pdf/SkPDFShader.h
@@ -61,10 +61,9 @@ public:
     bool equals(const SkPDFShader::State&) const;
 
 private:
-    SkPDFCanon* fCanon;
     SkAutoTDelete<const SkPDFShader::State> fShaderState;
     SkTDArray<SkPDFObject*> fResources;
-    SkPDFFunctionShader(SkPDFCanon*, SkPDFShader::State*);
+    SkPDFFunctionShader(SkPDFShader::State*);
     typedef SkPDFDict INHERITED;
 };
 
@@ -82,11 +81,10 @@ public:
     bool equals(const SkPDFShader::State&) const;
 
 private:
-    SkPDFCanon* fCanon;
     SkAutoTDelete<const SkPDFShader::State> fShaderState;
     SkAutoTUnref<SkPDFObject> fColorShader;
     SkAutoTUnref<SkPDFResourceDict> fResourceDict;
-    SkPDFAlphaFunctionShader(SkPDFCanon*, SkPDFShader::State*);
+    SkPDFAlphaFunctionShader(SkPDFShader::State*);
 };
 
 class SkPDFImageShader : public SkPDFStream {
@@ -98,10 +96,9 @@ public:
     bool equals(const SkPDFShader::State&) const;
 
 private:
-    SkPDFCanon* fCanon;
     SkAutoTDelete<const SkPDFShader::State> fShaderState;
     SkTSet<SkPDFObject*> fResources;
-    SkPDFImageShader(SkPDFCanon*, SkPDFShader::State*);
+    SkPDFImageShader(SkPDFShader::State*);
 };
 
 #endif