SkPDF: Glyph Useage Map improvements

src/pdf/SkPDFDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPDFDevice_DEFINED
 #define SkPDFDevice_DEFINED
 
@@ skipping 12 matching lines @@
 
 class SkImageBitmap;
 class SkPath;
 class SkPDFArray;
 class SkPDFCanon;
 class SkPDFDevice;
 class SkPDFDocument;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
-class SkPDFGlyphSetMap;
 class SkPDFObject;
 class SkRRect;
 
 /** \class SkPDFDevice
 
     The drawing context for the PDF backend.
 */
 class SkPDFDevice final : public SkBaseDevice {
 public:
     /** Create a PDF drawing context.  SkPDFDevice applies a
@@ skipping 108 matching lines @@
      */
     std::unique_ptr<SkStreamAsset> content() const;
 
     /** Writes the page contents to the stream. */
     void writeContent(SkWStream*) const;
 
     const SkMatrix& initialTransform() const {
         return fInitialTransform;
     }
 
-    /** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
-     *  that shows on this device.
-     */
-    const SkPDFGlyphSetMap& getFontGlyphUsage() const {
-        return *(fFontGlyphUsage.get());
-    }
-
     SkPDFCanon* getCanon() const;
 
     // It is important to not confuse GraphicStateEntry with SkPDFGraphicState, the
     // later being our representation of an object in the PDF file.
     struct GraphicStateEntry {
         GraphicStateEntry();
 
         // Compare the fields we care about when setting up a new content entry.
         bool compareInitialState(const GraphicStateEntry& b);
 
@@ skipping 79 matching lines @@
     SkTDArray<SkPDFObject*> fShaderResources;
 
     struct ContentEntry {
         GraphicStateEntry fState;
         SkDynamicMemoryWStream fContent;
     };
     SkSinglyLinkedList<ContentEntry> fContentEntries;
 
     const SkClipStack* fClipStack;
 
-    // Glyph ids used for each font on this device.
-    std::unique_ptr<SkPDFGlyphSetMap> fFontGlyphUsage;
-
     SkScalar fRasterDpi;
 
     SkBitmap fLegacyBitmap;
 
     SkPDFDocument* fDocument;
     ////////////////////////////////////////////////////////////////////////////
 
     SkPDFDevice(SkISize pageSize,
                 SkScalar rasterDpi,
                 SkPDFDocument* doc,
                 bool flip);
 
     SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
     void init();
-    void cleanUp(bool clearFontUsage);
+    void cleanUp();
     SkPDFFormXObject* createFormXObjectFromDevice();
 
     void drawFormXObjectWithMask(int xObjectIndex,
                                  SkPDFFormXObject* mask,
                                  const SkClipStack* clipStack,
                                  const SkRegion& clipRegion,
                                  SkXfermode::Mode mode,
                                  bool invertClip);
 
     // If the paint or clip is such that we shouldn't draw anything, this
@@ skipping 39 matching lines @@
 
     typedef SkBaseDevice INHERITED;
 
     // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
     // an SkPDFDevice
     //friend class SkDocument_PDF;
     //friend class SkPDFImageShader;
 };
 
 #endif