SkPDF: Glyph Useage Map improvements

src/pdf/SkPDFFont.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 SkPDFFont_DEFINED
 #define SkPDFFont_DEFINED
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitSet.h"
 #include "SkPDFTypes.h"
 #include "SkTDArray.h"
 #include "SkTypeface.h"
 
 class SkPDFCanon;
 class SkPDFFont;
 
 class SkPDFGlyphSet : SkNoncopyable {
 public:
     SkPDFGlyphSet();
+    SkPDFGlyphSet(SkPDFGlyphSet&& o) : fBitSet(std::move(o.fBitSet)) {}
 
     void set(const uint16_t* glyphIDs, int numGlyphs);
     bool has(uint16_t glyphID) const;
-    void merge(const SkPDFGlyphSet& usage);
     void exportTo(SkTDArray<uint32_t>* glyphIDs) const;
 
 private:
     SkBitSet fBitSet;
 };
 
 class SkPDFGlyphSetMap : SkNoncopyable {
 public:
-    struct FontGlyphSetPair {
-        FontGlyphSetPair(SkPDFFont* font, SkPDFGlyphSet* glyphSet);
-
+    struct FontGlyphSetPair : SkNoncopyable {
+        FontGlyphSetPair() : fFont(nullptr) {}
+        FontGlyphSetPair(FontGlyphSetPair&& o)
+            : fFont(o.fFont)
+            , fGlyphSet(std::move(o.fGlyphSet)) {
+            o.fFont = nullptr;
+        }
         SkPDFFont* fFont;
-        SkPDFGlyphSet* fGlyphSet;
+        SkPDFGlyphSet fGlyphSet;
     };
 
     SkPDFGlyphSetMap();
     ~SkPDFGlyphSetMap();
 
     const FontGlyphSetPair* begin() const { return fMap.begin(); }
     const FontGlyphSetPair* end() const { return fMap.end(); }
 
-    void merge(const SkPDFGlyphSetMap& usage);
-    void reset();
-
     void noteGlyphUsage(SkPDFFont* font, const uint16_t* glyphIDs,
                         int numGlyphs);
 
 private:
     SkPDFGlyphSet* getGlyphSetForFont(SkPDFFont* font);
 
-    SkTDArray<FontGlyphSetPair> fMap;
+    SkTArray<FontGlyphSetPair> fMap;
 };
 
 
 /** \class SkPDFFont
     A PDF Object class representing a font.  The font may have resources
     attached to it in order to embed the font.  SkPDFFonts are canonicalized
     so that resource deduplication will only include one copy of a font.
     This class uses the same pattern as SkPDFGraphicState, a static weak
     reference to each instantiated class.
 */
@@ skipping 124 matching lines @@
     uint16_t fLastGlyphID;
     sk_sp<const SkAdvancedTypefaceMetrics> fFontInfo;
     sk_sp<SkPDFDict> fDescriptor;
 
     SkAdvancedTypefaceMetrics::FontType fFontType;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif