Deduplicate typefaces across sub-pictures

include/core/SkPicture.h

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
 #include "SkTypes.h"
 
 class GrContext;
 class SkBigPicture;
 class SkBitmap;
 class SkCanvas;
 class SkPictureData;
 class SkPixelSerializer;
+class SkRefCntSet;
 class SkStream;
+class SkTypefacePlayback;
 class SkWStream;
 struct SkPictInfo;
 
 /** \class SkPicture
 
     An SkPicture records drawing commands made to a canvas to be played back at a later time.
     This base class handles serialization and a few other miscellany.
 */
 class SK_API SkPicture : public SkRefCnt {
 public:
@@ skipping 124 matching lines @@
     static void SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set);
     static bool PictureIOSecurityPrecautionsEnabled();
 
 private:
     // Subclass whitelist.
     SkPicture();
     friend class SkBigPicture;
     friend class SkEmptyPicture;
     template <typename> friend class SkMiniPicture;
 
+    void serialize(SkWStream*, SkPixelSerializer*, SkRefCntSet* typefaces) const;
+    static SkPicture* CreateFromStream(SkStream*,
+                                       InstallPixelRefProc proc,
+                                       SkTypefacePlayback*);
+    friend class SkPictureData;
+
     virtual int numSlowPaths() const = 0;
     friend struct SkPathCounter;
 
     // V35: Store SkRect (rather then width & height) in header
     // V36: Remove (obsolete) alphatype from SkColorTable
     // V37: Added shadow only option to SkDropShadowImageFilter (last version to record CLEAR)
     // V38: Added PictureResolution option to SkPictureImageFilter
     // V39: Added FilterLevel option to SkPictureImageFilter
     // V40: Remove UniqueID serialization from SkImageFilter.
     // V41: Added serialization of SkBitmapSource's filterQuality parameter
@@ skipping 13 matching lines @@
     static bool IsValidPictInfo(const SkPictInfo& info);
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
 
     SkPictInfo createHeader() const;
     SkPictureData* backport() const;
 
     mutable uint32_t fUniqueID;
 };
 
 #endif