Simplify reference management in SkPDF

src/pdf/SkPDFGraphicState.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 "SkData.h"
 #include "SkLazyPtr.h"
 #include "SkPDFCanon.h"
@@ skipping 99 matching lines @@
 
 bool SkPDFGraphicState::equals(const SkPaint& paint) const {
     return equivalent(paint, fPaint);
 }
 
 SkPDFGraphicState::~SkPDFGraphicState() {
     SkAutoMutexAcquire lock(SkPDFCanon::GetPaintMutex());
     if (!fSMask) {
         SkPDFCanon::GetCanon().removeGraphicState(this);
     }
-    fResources.unrefAll();
-}
-
-void SkPDFGraphicState::getResources(
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
 }
 
 void SkPDFGraphicState::emitObject(SkWStream* stream, SkPDFCatalog* catalog) {
     populateDict();
     SkPDFDict::emitObject(stream, catalog);
 }
 
 // static
 SkPDFGraphicState* SkPDFGraphicState::GetGraphicStateForPaint(
         const SkPaint& paint) {
@@ skipping 52 matching lines @@
     } else if (sMaskMode == kLuminosity_SMaskMode) {
         sMaskDict->insertName("S", "Luminosity");
     }
     sMaskDict->insert("G", new SkPDFObjRef(sMask))->unref();
 
     SkPDFGraphicState* result = new SkPDFGraphicState;
     result->fPopulated = true;
     result->fSMask = true;
     result->insertName("Type", "ExtGState");
     result->insert("SMask", sMaskDict.get());
-    result->fResources.push(sMask);
-    sMask->ref();
 
     if (invert) {
         SkPDFObject* invertFunction = GetInvertFunction();
-        result->fResources.push(invertFunction);
-        invertFunction->ref();
         sMaskDict->insert("TR", new SkPDFObjRef(invertFunction))->unref();

[mtklein, 2015/01/26 23:38:59]

Might move the call to GetInvertFunction() right in line?

[hal.canary, 2015/02/09 23:35:01]

Done.

     }
 
     return result;
 }
 
 SkPDFGraphicState* SkPDFGraphicState::CreateNoSMaskGraphicState() {
     SkPDFGraphicState* noSMaskGS = SkNEW(SkPDFGraphicState);
     noSMaskGS->fPopulated = true;
     noSMaskGS->fSMask = true;
     noSMaskGS->insertName("Type", "ExtGState");
@@ skipping 56 matching lines @@
             fPaint.getXfermode()->asMode(&xfermode);
         // If we don't support the mode, just use kSrcOver_Mode.
         if (xfermode < 0 || xfermode > SkXfermode::kLastMode ||
             as_blend_mode(xfermode) == NULL) {
             xfermode = SkXfermode::kSrcOver_Mode;
             NOT_IMPLEMENTED("unsupported xfermode", false);
         }
         insertName("BM", as_blend_mode(xfermode));
     }
 }