PDF: Canon now owns a reference to all interned objects

src/pdf/SkPDFShader.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 SkPDFShader_DEFINED
@@ skipping 43 matching lines @@
 class SkPDFFunctionShader : public SkPDFDict {
     SK_DECLARE_INST_COUNT(SkPDFFunctionShader);
 
 public:
     static SkPDFFunctionShader* Create(SkPDFCanon*,
                                        SkAutoTDelete<SkPDFShader::State>*);
     virtual ~SkPDFFunctionShader();
     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;
 };
 
 /**
  * A shader for PDF gradients. This encapsulates the function shader
  * inside a tiling pattern while providing a common pattern interface.
  * The encapsulation allows the use of a SMask for transparency gradients.
  */
 class SkPDFAlphaFunctionShader : public SkPDFStream {
 public:
     static SkPDFAlphaFunctionShader* Create(SkPDFCanon*,
                                             SkScalar dpi,
                                             SkAutoTDelete<SkPDFShader::State>*);
     virtual ~SkPDFAlphaFunctionShader();
     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 {
 public:
     static SkPDFImageShader* Create(SkPDFCanon*,
                                     SkScalar dpi,
                                     SkAutoTDelete<SkPDFShader::State>*);
     virtual ~SkPDFImageShader();
     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