Deduplicate typefaces across sub-pictures

src/core/SkPictureData.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 SkPictureData_DEFINED
 #define SkPictureData_DEFINED
 
@@ skipping 44 matching lines @@
 
 // Always write this guy last (with no length field afterwards)
 #define SK_PICT_EOF_TAG     SkSetFourByteTag('e', 'o', 'f', ' ')
 
 class SkPictureData {
 public:
     SkPictureData(const SkPictureRecord& record, const SkPictInfo&, bool deepCopyOps);
     // Does not affect ownership of SkStream.
     static SkPictureData* CreateFromStream(SkStream*,
                                            const SkPictInfo&,
-                                           SkPicture::InstallPixelRefProc);
+                                           SkPicture::InstallPixelRefProc,
+                                           SkTypefacePlayback*);
     static SkPictureData* CreateFromBuffer(SkReadBuffer&, const SkPictInfo&);
 
     virtual ~SkPictureData();
 
-    void serialize(SkWStream*, SkPixelSerializer*) const;
+    void serialize(SkWStream*, SkPixelSerializer*, SkRefCntSet*) const;
     void flatten(SkWriteBuffer&) const;
 
     bool containsBitmaps() const;
 
     bool hasText() const { return fContentInfo.hasText(); }
 
     int opCount() const { return fContentInfo.numOperations(); }
 
     const SkData* opData() const { return fOpData; }
 
 protected:
     explicit SkPictureData(const SkPictInfo& info);
 
     // Does not affect ownership of SkStream.
-    bool parseStream(SkStream*, SkPicture::InstallPixelRefProc);
+    bool parseStream(SkStream*, SkPicture::InstallPixelRefProc, SkTypefacePlayback*);
     bool parseBuffer(SkReadBuffer& buffer);
 
 public:
     const SkBitmap& getBitmap(SkReader32* reader) const {
         const int index = reader->readInt();
         return fBitmaps[index];
     }
 
     const SkImage* getImage(SkReader32* reader) const {
         const int index = reader->readInt();
         return fImageRefs[index];
     }
-    
+
     const SkPath& getPath(SkReader32* reader) const {
         int index = reader->readInt() - 1;
         return fPaths[index];
     }
 
     const SkPicture* getPicture(SkReader32* reader) const {
         int index = reader->readInt();
         SkASSERT(index > 0 && index <= fPictureCount);
         return fPictureRefs[index - 1];
     }
@@ skipping 28 matching lines @@
                                      GrPixelConfig config, SkScalar dpi) const;
 
     bool suitableForLayerOptimization() const;
 #endif
 
 private:
     void init();
 
     // these help us with reading/writing
     // Does not affect ownership of SkStream.
-    bool parseStreamTag(SkStream*, uint32_t tag, uint32_t size, SkPicture::InstallPixelRefProc);
+    bool parseStreamTag(SkStream*, uint32_t tag, uint32_t size,
+                        SkPicture::InstallPixelRefProc, SkTypefacePlayback*);
     bool parseBufferTag(SkReadBuffer&, uint32_t tag, uint32_t size);
     void flattenToBuffer(SkWriteBuffer&) const;
 
     // Only used by getBitmap() if the passed in index is SkBitmapHeap::INVALID_SLOT. This empty
     // bitmap allows playback to draw nothing and move on.
     SkBitmap fBadBitmap;
 
     SkTArray<SkBitmap> fBitmaps;
     SkTArray<SkPaint>  fPaints;
     SkTArray<SkPath>   fPaths;
@@ skipping 14 matching lines @@
 
     const SkPictInfo fInfo;
 
     static void WriteFactories(SkWStream* stream, const SkFactorySet& rec);
     static void WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec);
 
     void initForPlayback() const;
 };
 
 #endif