PDF: Now threadsafe!

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 "SkDeflateWStream.h"
 #include "SkPDFBitmap.h"
@@ skipping 229 matching lines @@
     if (fSMask) {
         pdfDict.insert("SMask", new SkPDFObjRef(fSMask))->unref();
     }
     if (deflate) {
         pdfDict.insertName("Filter", "FlateDecode");
     }
     pdfDict.insertInt("Length", length);
     pdfDict.emitObject(stream, catalog);
 }
 
-SkPDFBitmap::SkPDFBitmap(const SkBitmap& bm, SkPDFObject* smask)
-    : fBitmap(bm), fSMask(smask) {}
+SkPDFBitmap::SkPDFBitmap(SkPDFCanon* canon,
+                         const SkBitmap& bm,
+                         SkPDFObject* smask)
+    : fCanon(canon), fBitmap(bm), fSMask(smask) {}
 
-SkPDFBitmap::~SkPDFBitmap() {
-    SkAutoMutexAcquire autoMutexAcquire(SkPDFCanon::GetBitmapMutex());
-    SkPDFCanon::GetCanon().removeBitmap(this);
-}
+SkPDFBitmap::~SkPDFBitmap() { fCanon->removeBitmap(this); }
 
 ////////////////////////////////////////////////////////////////////////////////
 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;
         const SkPMColor* src = bm.getAddr32(0, y);
         for (int x = 0; x < bm.width(); ++x) {
             alpha |= SkGetPackedA32(*src++);
         }
         if (alpha) {
             return false;
         }
     }
     return true;
 }
 
-// TODO(halcanary): SkPDFBitmap::Create should take a SkPDFCanon* parameter.
-SkPDFBitmap* SkPDFBitmap::Create(const SkBitmap& bitmap,
+SkPDFBitmap* SkPDFBitmap::Create(SkPDFCanon* canon,
+                                 const SkBitmap& bitmap,
                                  const SkIRect& subset) {
+    SkASSERT(canon);
     if (kN32_SkColorType != bitmap.colorType()) {
         // TODO(halcanary): support other colortypes.
         return NULL;
     }
     SkBitmap bm;
     // Should extractSubset be done by the SkPDFDevice?
     if (!bitmap.extractSubset(&bm, subset)) {
         return NULL;
     }
     if (bm.drawsNothing()) {
         return NULL;
     }
     if (!bm.isImmutable()) {
         SkBitmap copy;
         if (!bm.copyTo(&copy)) {
             return NULL;
         }
         copy.setImmutable();
         bm = copy;
     }
 
-    SkAutoMutexAcquire autoMutexAcquire(SkPDFCanon::GetBitmapMutex());
-    SkPDFCanon& canon = SkPDFCanon::GetCanon();
-    SkPDFBitmap* pdfBitmap = canon.findBitmap(bm);
+    SkPDFBitmap* pdfBitmap = canon->findBitmap(bm);
     if (pdfBitmap) {
         return SkRef(pdfBitmap);
     }
     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, (bm, smask));
-    canon.addBitmap(pdfBitmap);
+    pdfBitmap = SkNEW_ARGS(SkPDFBitmap, (canon, bm, smask));
+    canon->addBitmap(pdfBitmap);
     return pdfBitmap;
 }