SkPDF: draw{Image,Bitmap} always serializes early

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 "SkImage.h"
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFont.h"
 #include "SkPDFShader.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 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.foreach ([](WrapGS w) { w.fPtr->unref(); });
     fGraphicStateRecords.reset();
 
-    fBitmapToImageMap.foreach(
-            [](SkBitmapKey, const SkImage** p) { SkSafeUnref(*p); });
-    fBitmapToImageMap.reset();
-
-    fPDFBitmapMap.foreach([](uint32_t, SkPDFObject** p) { SkSafeUnref(*p); });
+    fPDFBitmapMap.foreach([](SkBitmapKey, SkPDFObject** p) { (*p)->unref(); });
     fPDFBitmapMap.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class T> T* assert_ptr(T* p) { SkASSERT(p); return p; }
 
 // requires `bool T::equals(const U&) const`
 template <typename T, typename U>
 T* find_item(const SkTDArray<T*>& ptrArray, const U& object) {
@@ skipping 75 matching lines @@
 
 void SkPDFCanon::addGraphicState(const SkPDFGraphicState* state) {
     SkASSERT(state);
     WrapGS w(SkRef(state));
     SkASSERT(!fGraphicStateRecords.contains(w));
     fGraphicStateRecords.add(w);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SkPDFObject* SkPDFCanon::findPDFBitmap(const SkImage* image) const {
-    SkPDFObject** ptr = fPDFBitmapMap.find(image->uniqueID());
-    return ptr ? *ptr : nullptr;
+sk_sp<SkPDFObject> SkPDFCanon::findPDFBitmap(SkBitmapKey key) const {
+    SkPDFObject** ptr = fPDFBitmapMap.find(key);
+    return ptr ? sk_ref_sp(*ptr) : sk_sp<SkPDFObject>();
 }
 
-void SkPDFCanon::addPDFBitmap(uint32_t imageUniqueID, SkPDFObject* pdfBitmap) {
-    fPDFBitmapMap.set(imageUniqueID, SkRef(pdfBitmap));
+void SkPDFCanon::addPDFBitmap(SkBitmapKey key, sk_sp<SkPDFObject> pdfBitmap) {
+    fPDFBitmapMap.set(key, pdfBitmap.release());
 }
 
-const SkImage* SkPDFCanon::bitmapToImage(const SkBitmap& bm) {
-    // reference remains owned by the fBitmapToImageMap!
-    SkBitmapKey key(bm);
-    if (const SkImage** img = fBitmapToImageMap.find(key)) {
-        return *img;
-    }
-    if (SkImage* image = SkImage::MakeFromBitmap(bm).release()) {
-        return *fBitmapToImageMap.set(key, image);
-    }
-    SkBitmap n32bitmap;  // SkImage::NewFromBitmap can be finicky.
-    bm.copyTo(&n32bitmap, kN32_SkColorType);
-    return *fBitmapToImageMap.set(key, SkImage::MakeFromBitmap(n32bitmap).release());
-}
+////////////////////////////////////////////////////////////////////////////////
 
 sk_sp<SkPDFStream> SkPDFCanon::makeInvertFunction() {
     if (fInvertFunction) {
         return fInvertFunction;
     }
     fInvertFunction = SkPDFGraphicState::MakeInvertFunction();
     return fInvertFunction;
 }
 sk_sp<SkPDFDict> SkPDFCanon::makeNoSmaskGraphicState() {
     if (fNoSmaskGraphicState) {
         return fNoSmaskGraphicState;
     }
     fNoSmaskGraphicState = SkPDFGraphicState::MakeNoSmaskGraphicState();
     return fNoSmaskGraphicState;
 }
 sk_sp<SkPDFArray> SkPDFCanon::makeRangeObject() {
     if (fRangeObject) {
         return fRangeObject;
     }
     fRangeObject = SkPDFShader::MakeRangeObject();
     return fRangeObject;
 }