SkPDF: Implement drawImage*() properly

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();
-    fBitmapRecords.unrefAll();
-    fBitmapRecords.reset();
+
+    fBitmapToImageMap.foreach(
+            [](SkBitmapKey, const SkImage** p) { SkSafeUnref(*p); });
+    fBitmapToImageMap.reset();
+
+    fPDFBitmapMap.foreach([](uint32_t, SkPDFObject** p) { SkSafeUnref(*p); });
+    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) {
     for (int i = 0; i < ptrArray.count(); ++i) {
@@ skipping 74 matching lines @@
 
 void SkPDFCanon::addGraphicState(const SkPDFGraphicState* state) {
     SkASSERT(state);
     WrapGS w(SkRef(state));
     SkASSERT(!fGraphicStateRecords.contains(w));
     fGraphicStateRecords.add(w);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SkPDFBitmap* SkPDFCanon::findBitmap(const SkBitmap& bm) const {
-    return find_item(fBitmapRecords, bm);
+SkPDFObject* SkPDFCanon::findPDFBitmap(const SkImage* image) const {
+    SkPDFObject** ptr = fPDFBitmapMap.find(image->uniqueID());
+    return ptr ? *ptr : nullptr;
 }
 
-void SkPDFCanon::addBitmap(SkPDFBitmap* pdfBitmap) {
-    fBitmapRecords.push(SkRef(pdfBitmap));
+void SkPDFCanon::addPDFBitmap(uint32_t imageUniqueID, SkPDFObject* pdfBitmap) {
+    fPDFBitmapMap.set(imageUniqueID, SkRef(pdfBitmap));
 }
+
+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::NewFromBitmap(bm)) {
+        return *fBitmapToImageMap.set(key, image);
+    }
+    SkBitmap n32bitmap;  // SkImage::NewFromBitmap can be finicky.
+    bm.copyTo(&n32bitmap, kN32_SkColorType);
+    return *fBitmapToImageMap.set(key, SkImage::NewFromBitmap(n32bitmap));
+}