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

src/pdf/SkPDFTypes.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 SkPDFTypes_DEFINED
@@ skipping 13 matching lines @@
 
     A PDF Object is the base class for primitive elements in a PDF file.  A
     common subtype is used to ease the use of indirect object references,
     which are common in the PDF format.
 */
 class SkPDFObject : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkPDFObject)
 
     /** Return the size (number of bytes) of this object in the final output
-     *  file. Compound objects or objects that are computationally intensive
-     *  to output should override this method.
+     *  file. Only used for testing.
      *  @param catalog  The object catalog to use.
      *  @param indirect If true, output an object identifier with the object.
      */
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
     /** For non-primitive objects (i.e. objects defined outside this file),
      *  this method will add to newResourceObjects any objects that this method
      *  depends on, but not already in knownResourceObjects. This operates
      *  recursively so if this object depends on another object and that object
      *  depends on two more, all three objects will be added.
      *
      *  @param knownResourceObjects  The set of resources to be ignored.
      *  @param newResourceObjects  The set to append dependant resources to.
      */
@@ skipping 59 matching lines @@
     SK_DECLARE_INST_COUNT(SkPDFObjRef)
 
     /** Create a reference to an existing SkPDFObject.
      *  @param obj The object to reference.
      */
     explicit SkPDFObjRef(SkPDFObject* obj);
     virtual ~SkPDFObjRef();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
 private:
     SkAutoTUnref<SkPDFObject> fObj;
 
     typedef SkPDFObject INHERITED;
 };
 
 /** \class SkPDFInt
 
     An integer object in a PDF.
@@ skipping 26 matching lines @@
     SK_DECLARE_INST_COUNT(SkPDFBool)
 
     /** Create a PDF boolean.
      *  @param value true or false.
      */
     explicit SkPDFBool(bool value);
     virtual ~SkPDFBool();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
 private:
     bool fValue;
 
     typedef SkPDFObject INHERITED;
 };
 
 /** \class SkPDFScalar
 
     A real number object in a PDF.
@@ skipping 37 matching lines @@
      *  @param value     A string value.
      *  @param len       The length of value.
      *  @param wideChars Indicates if the top byte in value is significant and
      *                   should be encoded (true) or not (false).
      */
     SkPDFString(const uint16_t* value, size_t len, bool wideChars);
     virtual ~SkPDFString();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
     static SkString FormatString(const char* input, size_t len);
     static SkString FormatString(const uint16_t* input, size_t len,
                                  bool wideChars);
 private:
     static const size_t kMaxLen = 65535;
 
     const SkString fValue;
 
     static SkString DoFormatString(const void* input, size_t len,
@@ skipping 14 matching lines @@
      *  @param value The name.
      */
     explicit SkPDFName(const char name[]);
     explicit SkPDFName(const SkString& name);
     virtual ~SkPDFName();
 
     bool operator==(const SkPDFName& b) const;
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
 private:
     static const size_t kMaxLen = 127;
 
     const SkString fValue;
 
     static SkString FormatName(const SkString& input);
 
     typedef SkPDFObject INHERITED;
 };
 
 /** \class SkPDFArray
 
     An array object in a PDF.
 */
 class SkPDFArray : public SkPDFObject {
 public:
     SK_DECLARE_INST_COUNT(SkPDFArray)
 
     /** Create a PDF array. Maximum length is 8191.
      */
     SkPDFArray();
     virtual ~SkPDFArray();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
     /** The size of the array.
      */
     int size() { return fValue.count(); }
 
     /** Preallocate space for the given number of entries.
      *  @param length The number of array slots to preallocate.
      */
     void reserve(int length);
 
@@ skipping 51 matching lines @@
 
     /** Create a PDF dictionary with a Type entry.
      *  @param type   The value of the Type entry.
      */
     explicit SkPDFDict(const char type[]);
 
     virtual ~SkPDFDict();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE;
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
     /** The size of the dictionary.
      */
     int size() const;
 
     /** Add the value to the dictionary with the given key.  Refs value.
      *  @param key   The key for this dictionary entry.
      *  @param value The value for this dictionary entry.
      *  @return The value argument is returned.
      */
@@ skipping 66 matching lines @@
 
     mutable SkMutex fMutex;  // protects modifications to fValue
     SkTDArray<struct Rec> fValue;
 
     SkPDFObject* append(SkPDFName* key, SkPDFObject* value);
 
     typedef SkPDFObject INHERITED;
 };
 
 #endif