Simplify reference management in SkPDF

src/pdf/SkPDFShader.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 "SkPDFShader.h"
@@ skipping 492 matching lines @@
     State(const State& other);
     State operator=(const State& rhs);
     void AllocateGradientInfoStorage();
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
     : SkPDFDict("Pattern"), fShaderState(state) {}
 
-void SkPDFFunctionShader::getResources(const SkTSet<SkPDFObject*>& known,
-                                       SkTSet<SkPDFObject*>* newr) {
-    GetResourcesHelper(&fResources, known, newr);
-}
-
 SkPDFFunctionShader::~SkPDFFunctionShader() {
     SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
     SkPDFCanon::GetCanon().removeFunctionShader(this);
     lock.release();
     fResources.unrefAll();
 }
 
 bool SkPDFFunctionShader::equals(const SkPDFShader::State& state) const {
     return state == *fShaderState;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFAlphaFunctionShader::SkPDFAlphaFunctionShader(SkPDFShader::State* state)
     : fShaderState(state) {}
 
 bool SkPDFAlphaFunctionShader::equals(const SkPDFShader::State& state) const {
     return state == *fShaderState;
 }
 
 SkPDFAlphaFunctionShader::~SkPDFAlphaFunctionShader() {
     SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
     SkPDFCanon::GetCanon().removeAlphaShader(this);
 }
 
-void SkPDFAlphaFunctionShader::getResources(const SkTSet<SkPDFObject*>& known,
-                                            SkTSet<SkPDFObject*>* newr) {
-    fResourceDict->getReferencedResources(known, newr, true);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state)
     : fShaderState(state) {}
 
 bool SkPDFImageShader::equals(const SkPDFShader::State& state) const {
     return state == *fShaderState;
 }
 
 SkPDFImageShader::~SkPDFImageShader() {
     SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
     SkPDFCanon::GetCanon().removeImageShader(this);
     lock.release();
     fResources.unrefAll();
 }
 
-void SkPDFImageShader::getResources(const SkTSet<SkPDFObject*>& known,
-                                    SkTSet<SkPDFObject*>* newr) {
-    GetResourcesHelper(&fResources.toArray(), known, newr);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 static SkPDFObject* get_pdf_shader_by_state(
         SkAutoTDelete<SkPDFShader::State>* autoState) {
     const SkPDFShader::State& state = **autoState;
     if (state.fType == SkShader::kNone_GradientType && state.fImage.isNull()) {
         // TODO(vandebo) This drops SKComposeShader on the floor.  We could
         // handle compose shader by pulling things up to a layer, drawing with
         // the first shader, applying the xfer mode and drawing again with the
         // second shader, then applying the layer to the original drawing.
@@ skipping 543 matching lines @@
         }
     }
 
     // Put the canvas into the pattern stream (fContent).
     SkAutoTDelete<SkStream> content(pattern.content());
 
     SkPDFImageShader* imageShader =
             SkNEW_ARGS(SkPDFImageShader, (autoState->detach()));
     imageShader->setData(content.get());
 
-    SkPDFResourceDict* resourceDict = pattern.getResourceDict();
-    resourceDict->getReferencedResources(imageShader->fResources,
-                                         &imageShader->fResources, false);
-
     populate_tiling_pattern_dict(imageShader, patternBBox,
                                  pattern.getResourceDict(), finalMatrix);
 
     imageShader->fShaderState->fImage.unlockPixels();
 
     SkPDFCanon::GetCanon().addImageShader(imageShader);
     return imageShader;
 }
 
 bool SkPDFShader::State::operator==(const SkPDFShader::State& b) const {
@@ skipping 179 matching lines @@
     return false;
 }
 
 void SkPDFShader::State::AllocateGradientInfoStorage() {
     fColorData.set(sk_malloc_throw(
                fInfo.fColorCount * (sizeof(SkColor) + sizeof(SkScalar))));
     fInfo.fColors = reinterpret_cast<SkColor*>(fColorData.get());
     fInfo.fColorOffsets =
             reinterpret_cast<SkScalar*>(fInfo.fColors + fInfo.fColorCount);
 }