Cleanup SkPDFObject::emit*

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 12 matching lines @@
 /** \class SkPDFObject
 
     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. Only used for testing.
+    /** Subclasses must implement this method to print the object to the
+     *  PDF file.
      *  @param catalog  The object catalog to use.
-     *  @param indirect If true, output an object identifier with the object.
+     *  @param stream   The writable output stream to send the output to.
      */
-    size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) = 0;
 
     /** 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.
      */
     virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
                               SkTSet<SkPDFObject*>* newResourceObjects);
 
-    /** Emit this object unless the catalog has a substitute object, in which
-     *  case emit that.
-     *  @see emitObject
-     */
-    void emit(SkWStream* stream, SkPDFCatalog* catalog, bool indirect);
-
-    /** Helper function to output an indirect object.
-     *  @param catalog The object catalog to use.
-     *  @param stream  The writable output stream to send the output to.
-     */
-    void emitIndirectObject(SkWStream* stream, SkPDFCatalog* catalog);
-
-    /** Helper function to find the size of an indirect object.
-     *  @param catalog The object catalog to use.
-     */
-    size_t getIndirectOutputSize(SkPDFCatalog* catalog);
-
     /** Static helper function to add a resource to a list.  The list takes
      *  a reference.
      * @param resource  The resource to add.
      * @param list      The list to add the resource to.
      */
     static void AddResourceHelper(SkPDFObject* resource,
                                   SkTDArray<SkPDFObject*>* list);
 
     /** Static helper function to copy and reference the resources (and all
      *   their subresources) into a new list.
      * @param resources The resource list.
      * @param newResourceObjects All the resource objects (recursively) used on
      *                         the page are added to this array.  This gives
      *                         the caller a chance to deduplicate resources
      *                         across pages.
      * @param knownResourceObjects  The set of resources to be ignored.
      */
     static void GetResourcesHelper(
             const SkTDArray<SkPDFObject*>* resources,
             const SkTSet<SkPDFObject*>& knownResourceObjects,
             SkTSet<SkPDFObject*>* newResourceObjects);
 
-protected:
-    /** Subclasses must implement this method to print the object to the
-     *  PDF file.
-     *  @param catalog  The object catalog to use.
-     *  @param stream   The writable output stream to send the output to.
-     */
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) = 0;
-
+private:
     typedef SkRefCnt INHERITED;
 };
 
 /** \class SkPDFObjRef
 
     An indirect reference to a PDF object.
 */
 class SkPDFObjRef : public SkPDFObject {
 public:
     SK_DECLARE_INST_COUNT(SkPDFObjRef)
@@ skipping 319 matching lines @@
 
     mutable SkMutex fMutex;  // protects modifications to fValue
     SkTDArray<struct Rec> fValue;
 
     SkPDFObject* append(SkPDFName* key, SkPDFObject* value);
 
     typedef SkPDFObject INHERITED;
 };
 
 #endif