Simplify reference management in SkPDF

src/pdf/SkPDFCatalog.h

Index: src/pdf/SkPDFCatalog.h
diff --git a/src/pdf/SkPDFCatalog.h b/src/pdf/SkPDFCatalog.h
index ecefd0a0728ab4252ac42f711cd2937f01e7663d..280da669636f215eb0b58f66fca1a0a212d4ac02 100644
--- a/src/pdf/SkPDFCatalog.h
+++ b/src/pdf/SkPDFCatalog.h
@@ -43,17 +43,10 @@ public:
      */
     void setFileOffset(SkPDFObject* obj, off_t offset);
 
-    /** Output the object number for the passed object.
+    /** Get the object number for the passed object.
      *  @param obj         The object of interest.
-     *  @param stream      The writable output stream to send the output to.
-     */
-    void emitObjectNumber(SkWStream* stream, SkPDFObject* obj);
-
-    /** Return the number of bytes that would be emitted for the passed
-     *  object's object number.
-     *  @param obj         The object of interest
      */
-    size_t getObjectNumberSize(SkPDFObject* obj);
+    int32_t getObjectNumber(SkPDFObject* obj);
 
     /** Return the document flags in effect for this catalog/document.
      */
@@ -76,10 +69,6 @@ public:
      */
     SkPDFObject* getSubstituteObject(SkPDFObject* object);
 
-    /** get the resources of substitute objects.
-     */
-    SkTSet<SkPDFObject*>* getSubstituteList(bool firstPage);
-
 private:
     struct Rec {
         Rec(SkPDFObject* object, bool onFirstPage)
@@ -103,7 +92,7 @@ private:
     };
 
     // TODO(vandebo): Make this a hash if it's a performance problem.
-    SkTDArray<struct Rec> fCatalog;
+    SkTDArray<Rec> fCatalog;
 
     // TODO(arthurhsu): Make this a hash if it's a performance problem.
     SkTDArray<SubstituteMapping> fSubstituteMap;
@@ -119,7 +108,7 @@ private:
 
     SkPDFDocument::Flags fDocumentFlags;
 
-    int findObjectIndex(SkPDFObject* obj) const;
+    int findObjectIndex(SkPDFObject* obj);
 
     int assignObjNum(SkPDFObject* obj);
 };