In SkPDFDocument::emitPDF(), stop pre-calculating file offsets.

src/pdf/SkPDFCatalog.h

 
 /*
  * Copyright 2010 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 SkPDFCatalog_DEFINED
@@ skipping 19 matching lines @@
     ~SkPDFCatalog();
 
     /** Add the passed object to the catalog.  Refs obj.
      *  @param obj         The object to add.
      *  @param onFirstPage Is the object on the first page.
      *  @return The obj argument is returned.
      */
     SkPDFObject* addObject(SkPDFObject* obj, bool onFirstPage);
 
     /** Inform the catalog of the object's position in the final stream.
-     *  The object should already have been added to the catalog.  Returns
-     *  the object's size.
+     *  The object should already have been added to the catalog.
      *  @param obj         The object to add.
      *  @param offset      The byte offset in the output stream of this object.
      */
-    size_t setFileOffset(SkPDFObject* obj, off_t offset);
+    void setFileOffset(SkPDFObject* obj, off_t offset);
 
     /** Output 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
@@ skipping 14 matching lines @@
 
     /** Set substitute object for the passed object.
      */
     void setSubstitute(SkPDFObject* original, SkPDFObject* substitute);
 
     /** Find and return any substitute object set for the passed object. If
      *  there is none, return the passed object.
      */
     SkPDFObject* getSubstituteObject(SkPDFObject* object);
 
-    /** Set file offsets for the resources of substitute objects.
-     *  @param fileOffset Accumulated offset of current document.
-     *  @param firstPage  Indicate whether this is for the first page only.
-     *  @return           Total size of resources of substitute objects.
+    /** get the resources of substitute objects.
      */
-    off_t setSubstituteResourcesOffsets(off_t fileOffset, bool firstPage);
-
-    /** Emit the resources of substitute objects.
-     */
-    void emitSubstituteResources(SkWStream* stream, bool firstPage);
+    SkTSet<SkPDFObject*>* getSubstituteList(bool firstPage);
 
 private:
     struct Rec {
         Rec(SkPDFObject* object, bool onFirstPage)
             : fObject(object),
               fFileOffset(0),
               fObjNumAssigned(false),
               fOnFirstPage(onFirstPage) {
         }
         SkPDFObject* fObject;
@@ skipping 23 matching lines @@
     // Next object number to assign (on page > 1).
     uint32_t fNextObjNum;
     // Next object number to assign on the first page.
     uint32_t fNextFirstPageObjNum;
 
     SkPDFDocument::Flags fDocumentFlags;
 
     int findObjectIndex(SkPDFObject* obj) const;
 
     int assignObjNum(SkPDFObject* obj);
-
-    SkTSet<SkPDFObject*>* getSubstituteList(bool firstPage);
 };
 
 #endif