SkPDF: Implement drawImage*() properly

src/pdf/SkPDFCanon.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPDFCanon_DEFINED
 #define SkPDFCanon_DEFINED
 
+#include "SkBitmap.h"
 #include "SkPDFGraphicState.h"
 #include "SkPDFShader.h"
 #include "SkTDArray.h"
 #include "SkTHash.h"
 
-class SkBitmap;
 class SkPDFFont;
-class SkPDFBitmap;
 class SkPaint;
+class SkImage;
+
+class SkBitmapKey {
+public:
+    SkBitmapKey() : fSubset(SkIRect::MakeEmpty()), fGenID(0) {}
+    explicit SkBitmapKey(const SkBitmap& bm)
+        : fSubset(bm.getSubset()), fGenID(bm.getGenerationID()) {}
+    bool operator==(const SkBitmapKey& rhs) const {
+        return fGenID == rhs.fGenID && fSubset == rhs.fSubset;
+    }
+
+private:
+    SkIRect fSubset;
+    uint32_t fGenID;
+};
 
 /**
  *  The SkPDFCanon canonicalizes objects across PDF pages(SkPDFDevices).
  *
  *  The PDF backend works correctly if:
  *  -  There is no more than one SkPDFCanon for each thread.
  *  -  Every SkPDFDevice is given a pointer to a SkPDFCanon on creation.
  *  -  All SkPDFDevices in a document share the same SkPDFCanon.
  *  The SkDocument_PDF class makes this happen by owning a single
  *  SkPDFCanon.
@@ skipping 24 matching lines @@
 
     SkPDFAlphaFunctionShader* findAlphaShader(const SkPDFShader::State&) const;
     void addAlphaShader(SkPDFAlphaFunctionShader*);
 
     SkPDFImageShader* findImageShader(const SkPDFShader::State&) const;
     void addImageShader(SkPDFImageShader*);
 
     const SkPDFGraphicState* findGraphicState(const SkPDFGraphicState&) const;
     void addGraphicState(const SkPDFGraphicState*);
 
-    SkPDFBitmap* findBitmap(const SkBitmap&) const;
-    void addBitmap(SkPDFBitmap*);
+    SkPDFObject* findPDFBitmap(const SkImage* image) const;
+    void addPDFBitmap(uint32_t imageUniqueID, SkPDFObject*);
+    const SkImage* bitmapToImage(const SkBitmap&);
 
 private:
     struct FontRec {
         SkPDFFont* fFont;
         uint32_t fFontID;
         uint16_t fGlyphID;
     };
     SkTDArray<FontRec> fFontRecords;
 
     SkTDArray<SkPDFFunctionShader*> fFunctionShaderRecords;
@@ skipping 10 matching lines @@
             SkASSERT(rhs.fPtr);
             return *fPtr == *rhs.fPtr;
         }
         static uint32_t Hash(const WrapGS& w) {
             SkASSERT(w.fPtr);
             return w.fPtr->hash();
         }
     };
     SkTHashSet<WrapGS, WrapGS::Hash> fGraphicStateRecords;
 
-    SkTDArray<SkPDFBitmap*> fBitmapRecords;
+    SkTHashMap<SkBitmapKey, const SkImage*> fBitmapToImageMap;
+    SkTHashMap<uint32_t /*ImageUniqueID*/, SkPDFObject*> fPDFBitmapMap;
 };
 #endif  // SkPDFCanon_DEFINED