SKPDF: refactor pdfcatalog and pdfdocument

src/pdf/SkPDFDocument.h

Index: src/pdf/SkPDFDocument.h
diff --git a/src/pdf/SkPDFDocument.h b/src/pdf/SkPDFDocument.h
index 01290d034a8ac97a85e628c59408f0c6b050d7de..aab9606581a4b416a05eb4b2433be48a2cb83e94 100644
--- a/src/pdf/SkPDFDocument.h
+++ b/src/pdf/SkPDFDocument.h
@@ -11,17 +11,11 @@
 #define SkPDFDocument_DEFINED
 
 #include "SkAdvancedTypefaceMetrics.h"
-#include "SkRefCnt.h"
 #include "SkTDArray.h"
-#include "SkTemplates.h"
 
-class SkPDFCatalog;
 class SkPDFDevice;
-class SkPDFDict;
 class SkPDFPage;
-class SkPDFObject;
 class SkWStream;
-template <typename T> class SkTSet;
 
 /** \class SkPDFDocument
 
@@ -41,15 +35,6 @@ public:
      */
     bool emitPDF(SkWStream* stream);
 
-    /** Sets the specific page to the passed PDF device. If the specified
-     *  page is already set, this overrides it. Returns true if successful.
-     *  Will fail if the document has already been emitted.
-     *
-     *  @param pageNumber The position to add the passed device (1 based).
-     *  @param pdfDevice  The page to add to this document.
-     */
-    bool setPage(int pageNumber, SkPDFDevice* pdfDevice);
-
     /** Append the passed pdf device to the document as a new page.  Returns
      *  true if successful.  Will fail if the document has already been emitted.
      *
@@ -58,12 +43,6 @@ public:
     bool appendPage(SkPDFDevice* pdfDevice);
 
     /** Get the count of unique font types used in the document.
-     * DEPRECATED.
-     */
-    void getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 2]) const;
-
-    /** Get the count of unique font types used in the document.
      */
     void getCountOfFontTypes(
         int counts[SkAdvancedTypefaceMetrics::kOther_Font + 1],
@@ -71,32 +50,7 @@ public:
         int* notEmbedddableCount) const;
 
 private:
-    SkAutoTDelete<SkPDFCatalog> fCatalog;
-    int64_t fXRefFileOffset;
-
     SkTDArray<SkPDFPage*> fPages;
-    SkTDArray<SkPDFDict*> fPageTree;
-    SkPDFDict* fDocCatalog;
-    SkTSet<SkPDFObject*>* fFirstPageResources;
-    SkTSet<SkPDFObject*>* fOtherPageResources;
-    SkTDArray<SkPDFObject*> fSubstitutes;
-
-    SkPDFDict* fTrailerDict;
-
-    /** Output the PDF header to the passed stream.
-     *  @param stream    The writable output stream to send the header to.
-     */
-    void emitHeader(SkWStream* stream);
-
-    /** Get the size of the header.
-     */
-    size_t headerSize();
-
-    /** Output the PDF footer to the passed stream.
-     *  @param stream    The writable output stream to send the footer to.
-     *  @param objCount  The number of objects in the PDF.
-     */
-    void emitFooter(SkWStream* stream, int64_t objCount);
 };
 
 #endif