PDF: Canon now owns a reference to all interned objects

src/pdf/SkPDFBitmap.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 "SkColorPriv.h"
 #include "SkFlate.h"
 #include "SkPDFBitmap.h"
@@ skipping 234 matching lines @@
     }
     pdfDict.insertInt("Length", length);
     pdfDict.emitObject(stream, catalog);
 }
 
 SkPDFBitmap::SkPDFBitmap(SkPDFCanon* canon,
                          const SkBitmap& bm,
                          SkPDFObject* smask)
     : fCanon(canon), fBitmap(bm), fSMask(smask) {}
 
-SkPDFBitmap::~SkPDFBitmap() { fCanon->removeBitmap(this); }
+SkPDFBitmap::~SkPDFBitmap() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 static bool is_transparent(const SkBitmap& bm) {
     SkAutoLockPixels autoLockPixels(bm);
     if (NULL == bm.getPixels()) {
         return true;
     }
     SkASSERT(kN32_SkColorType == bm.colorType());
     for (int y = 0; y < bm.height(); ++y) {
         U8CPU alpha = 0;
@@ skipping 40 matching lines @@
     SkPDFObject* smask = NULL;
     if (!bm.isOpaque() && !SkBitmap::ComputeIsOpaque(bm)) {
         if (is_transparent(bm)) {
             return NULL;
         }
         // PDFAlphaBitmaps do not get directly canonicalized (they
         // are refed by the SkPDFBitmap).
         smask = SkNEW_ARGS(PDFAlphaBitmap, (bm));
     }
     pdfBitmap = SkNEW_ARGS(SkPDFBitmap, (canon, bm, smask));
-    canon->addBitmap(pdfBitmap);
+    canon->addBitmap(SkRef(pdfBitmap));

[mtklein, 2015/02/27 19:50:17]

This seems to distribute the responsibility for refcounting strangely.

Why isn't the ref inside addBitmap?  (Same for all other calls?)

[hal.canary, 2015/02/27 20:13:42]

Done.

     return pdfBitmap;
 }