PDF: Canon now owns a reference to all interned objects

src/pdf/SkPDFCanon.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFont.h"
 #include "SkPDFGraphicState.h"
 #include "SkPDFShader.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SkPDFCanon::SkPDFCanon() {}
-
-SkPDFCanon::~SkPDFCanon() {}
+void SkPDFCanon::reset() {
+    for (int i = 0; i < fFontRecords.count(); ++i) {
+        fFontRecords[i].fFont->unref();
+    }
+    fFontRecords.reset();
+    fFunctionShaderRecords.unrefAll();
+    fFunctionShaderRecords.reset();
+    fAlphaShaderRecords.unrefAll();
+    fAlphaShaderRecords.reset();
+    fImageShaderRecords.unrefAll();
+    fImageShaderRecords.reset();
+    fGraphicStateRecords.unrefAll();
+    fGraphicStateRecords.reset();
+    fBitmapRecords.unrefAll();
+    fBitmapRecords.reset();
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class T> T* assert_ptr(T* p) { SkASSERT(p); return p; }
 
-template <typename T>
-bool remove_item(SkTDArray<T>* array, const T& elem) {
-    int i = array->find(elem);
-    if (i >= 0) {
-        array->removeShuffle(i);
-        return true;
-    }
-    return false;
-}
-
 // requires `bool T::equals(const U&) const`
 template <typename T, typename U>
 T* find_item(const SkTDArray<T*>& ptrArray, const U& object) {
     for (int i = 0; i < ptrArray.count(); ++i) {
         if (ptrArray[i]->equals(object)) {
             return ptrArray[i];
         }
     }
     return NULL;
 }
@@ skipping 15 matching lines @@
         } else if (!relatedFont && SkPDFFont::kRelated_Match == match) {
             relatedFont = fFontRecords[i].fFont;
         }
     }
     *relatedFontPtr = relatedFont;  // May still be NULL.
     return NULL;
 }
 
 void SkPDFCanon::addFont(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID) {
     SkPDFCanon::FontRec* rec = fFontRecords.push();
-    rec->fFont = font;
+    rec->fFont = SkRef(font);
     rec->fFontID = fontID;
     rec->fGlyphID = fGlyphID;
 }
 
-void SkPDFCanon::removeFont(SkPDFFont* pdfFont) {
-    for (int i = 0; i < fFontRecords.count(); i++) {
-        if (fFontRecords[i].fFont == pdfFont) {
-            fFontRecords.removeShuffle(i);
-            return;
-        }
-    }
-    // Not all SkPDFFonts are added to the Canon.
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFFunctionShader* SkPDFCanon::findFunctionShader(
         const SkPDFShader::State& state) const {
     return find_item(fFunctionShaderRecords, state);
 }
 void SkPDFCanon::addFunctionShader(SkPDFFunctionShader* pdfShader) {
-    fFunctionShaderRecords.push(assert_ptr(pdfShader));
-}
-void SkPDFCanon::removeFunctionShader(SkPDFFunctionShader* pdfShader) {
-    SkAssertResult(remove_item(&fFunctionShaderRecords, pdfShader));
+    fFunctionShaderRecords.push(SkRef(pdfShader));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFAlphaFunctionShader* SkPDFCanon::findAlphaShader(
         const SkPDFShader::State& state) const {
     return find_item(fAlphaShaderRecords, state);
 }
 void SkPDFCanon::addAlphaShader(SkPDFAlphaFunctionShader* pdfShader) {
-    fAlphaShaderRecords.push(assert_ptr(pdfShader));
-}
-void SkPDFCanon::removeAlphaShader(SkPDFAlphaFunctionShader* pdfShader) {
-    SkAssertResult(remove_item(&fAlphaShaderRecords, pdfShader));
+    fAlphaShaderRecords.push(SkRef(pdfShader));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFImageShader* SkPDFCanon::findImageShader(
         const SkPDFShader::State& state) const {
     return find_item(fImageShaderRecords, state);
 }
 
 void SkPDFCanon::addImageShader(SkPDFImageShader* pdfShader) {
-    fImageShaderRecords.push(assert_ptr(pdfShader));
-}
-
-void SkPDFCanon::removeImageShader(SkPDFImageShader* pdfShader) {
-    SkAssertResult(remove_item(&fImageShaderRecords, pdfShader));
+    fImageShaderRecords.push(SkRef(pdfShader));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFGraphicState* SkPDFCanon::findGraphicState(const SkPaint& paint) const {
     return find_item(fGraphicStateRecords, paint);
 }
 
 void SkPDFCanon::addGraphicState(SkPDFGraphicState* state) {
-    fGraphicStateRecords.push(assert_ptr(state));
-}
-
-void SkPDFCanon::removeGraphicState(SkPDFGraphicState* pdfGraphicState) {
-    SkAssertResult(remove_item(&fGraphicStateRecords, pdfGraphicState));
+    fGraphicStateRecords.push(SkRef(state));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFBitmap* SkPDFCanon::findBitmap(const SkBitmap& bm) const {
     return find_item(fBitmapRecords, bm);
 }
 
 void SkPDFCanon::addBitmap(SkPDFBitmap* pdfBitmap) {
-    fBitmapRecords.push(assert_ptr(pdfBitmap));
+    fBitmapRecords.push(SkRef(pdfBitmap));
 }
-
-void SkPDFCanon::removeBitmap(SkPDFBitmap* pdfBitmap) {
-    SkAssertResult(remove_item(&fBitmapRecords, pdfBitmap));
-}