SkPDF: PDFShader code modernized.

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 "SkPDFGraphicState.h"
@@ skipping 30 matching lines @@
     void reset();
 
     // Returns exact match if there is one.  If not, it returns nullptr.
     // If there is no exact match, but there is a related font, we
     // still return nullptr, but also set *relatedFont.
     SkPDFFont* findFont(uint32_t fontID,
                         uint16_t glyphID,
                         SkPDFFont** relatedFont) const;
     void addFont(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID);
 
-    SkPDFFunctionShader* findFunctionShader(const SkPDFShader::State&) const;
-    void addFunctionShader(SkPDFFunctionShader*);
+    sk_sp<SkPDFObject> findFunctionShader(const SkPDFShader::State&) const;
+    void addFunctionShader(sk_sp<SkPDFObject>, SkPDFShader::State);
 
-    SkPDFAlphaFunctionShader* findAlphaShader(const SkPDFShader::State&) const;
-    void addAlphaShader(SkPDFAlphaFunctionShader*);
+    sk_sp<SkPDFObject> findAlphaShader(const SkPDFShader::State&) const;
+    void addAlphaShader(sk_sp<SkPDFObject>, SkPDFShader::State);
 
-    SkPDFImageShader* findImageShader(const SkPDFShader::State&) const;
-    void addImageShader(SkPDFImageShader*);
+    sk_sp<SkPDFObject> findImageShader(const SkPDFShader::State&) const;
+    void addImageShader(sk_sp<SkPDFObject>, SkPDFShader::State);
 
     const SkPDFGraphicState* findGraphicState(const SkPDFGraphicState&) const;
     void addGraphicState(const SkPDFGraphicState*);
 
     sk_sp<SkPDFObject> findPDFBitmap(SkBitmapKey key) const;
     void addPDFBitmap(SkBitmapKey key, sk_sp<SkPDFObject>);
 
     SkTHashMap<uint32_t, bool> fCanEmbedTypeface;
 
     SkPixelSerializer* getPixelSerializer() const { return fPixelSerializer.get(); }
     void setPixelSerializer(sk_sp<SkPixelSerializer> ps) {
         fPixelSerializer = std::move(ps);
     }
 
     sk_sp<SkPDFStream> makeInvertFunction();
     sk_sp<SkPDFDict> makeNoSmaskGraphicState();
     sk_sp<SkPDFArray> makeRangeObject();
 
 private:
     struct FontRec {
         SkPDFFont* fFont;
         uint32_t fFontID;
         uint16_t fGlyphID;
     };
     SkTDArray<FontRec> fFontRecords;
 
-    SkTDArray<SkPDFFunctionShader*> fFunctionShaderRecords;
-
-    SkTDArray<SkPDFAlphaFunctionShader*> fAlphaShaderRecords;
-
-    SkTDArray<SkPDFImageShader*> fImageShaderRecords;
+    struct ShaderRec {
+        SkPDFShader::State fShaderState;
+        sk_sp<SkPDFObject> fShaderObject;
+        ShaderRec(SkPDFShader::State s, sk_sp<SkPDFObject> o)
+            : fShaderState(std::move(s)), fShaderObject(std::move(o)) {}
+    };
+    SkTArray<ShaderRec> fFunctionShaderRecords;
+    SkTArray<ShaderRec> fAlphaShaderRecords;
+    SkTArray<ShaderRec> fImageShaderRecords;
 
     struct WrapGS {
         explicit WrapGS(const SkPDFGraphicState* ptr = nullptr) : fPtr(ptr) {}
         const SkPDFGraphicState* fPtr;
         bool operator==(const WrapGS& rhs) const {
             SkASSERT(fPtr);
             SkASSERT(rhs.fPtr);
             return *fPtr == *rhs.fPtr;
         }
         struct Hash {
             uint32_t operator()(const WrapGS& w) const {
                 SkASSERT(w.fPtr);
                 return w.fPtr->hash();
             }
         };
     };
     SkTHashSet<WrapGS, WrapGS::Hash> fGraphicStateRecords;
 
     // TODO(halcanary): make SkTHashMap<K, sk_sp<V>> work correctly.
     SkTHashMap<SkBitmapKey, SkPDFObject*> fPDFBitmapMap;
 
     sk_sp<SkPixelSerializer> fPixelSerializer;
     sk_sp<SkPDFStream> fInvertFunction;
     sk_sp<SkPDFDict> fNoSmaskGraphicState;
     sk_sp<SkPDFArray> fRangeObject;
 };
 #endif  // SkPDFCanon_DEFINED