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

src/pdf/SkPDFCatalog.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkPDFCatalog.h"
@@ skipping 20 matching lines @@
     SkASSERT(fNextFirstPageObjNum == 0);
     if (onFirstPage) {
         fFirstPageCount++;
     }
 
     struct Rec newEntry(obj, onFirstPage);
     fCatalog.append(1, &newEntry);
     return obj;
 }
 
-size_t SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
+void SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
     int objIndex = assignObjNum(obj) - 1;
     SkASSERT(fCatalog[objIndex].fObjNumAssigned);
     SkASSERT(fCatalog[objIndex].fFileOffset == 0);
     fCatalog[objIndex].fFileOffset = offset;
-
-    return getSubstituteObject(obj)->getOutputSize(this, true);
 }
 
 void SkPDFCatalog::emitObjectNumber(SkWStream* stream, SkPDFObject* obj) {
     stream->writeDecAsText(assignObjNum(obj));
     stream->writeText(" 0");  // Generation number is always 0.
 }
 
 size_t SkPDFCatalog::getObjectNumberSize(SkPDFObject* obj) {
     SkDynamicMemoryWStream buffer;
     emitObjectNumber(&buffer, obj);
@@ skipping 127 matching lines @@
 
 SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
     for (int i = 0; i < fSubstituteMap.count(); ++i) {
         if (object == fSubstituteMap[i].fOriginal) {
             return fSubstituteMap[i].fSubstitute;
         }
     }
     return object;
 }
 
-off_t SkPDFCatalog::setSubstituteResourcesOffsets(off_t fileOffset,
-                                                  bool firstPage) {
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
-    off_t offsetSum = fileOffset;
-    for (int i = 0; i < targetSet->count(); ++i) {
-        offsetSum += SkToOffT(setFileOffset((*targetSet)[i], offsetSum));
-    }
-    return offsetSum - fileOffset;
-}
-
-void SkPDFCatalog::emitSubstituteResources(SkWStream *stream, bool firstPage) {
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
-    for (int i = 0; i < targetSet->count(); ++i) {
-        (*targetSet)[i]->emit(stream, this, true);
-    }
-}
-
 SkTSet<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
     return firstPage ? &fSubstituteResourcesFirstPage :
                        &fSubstituteResourcesRemaining;
 }