Cleanup SkPDFObject::emit*

src/pdf/SkPDFDocument.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPDFCatalog.h"
@@ skipping 71 matching lines @@
     SkDELETE(fOtherPageResources);
 }
 
 namespace {
 class Streamer {
 public:
     Streamer(SkPDFCatalog* cat, SkWStream* out)
         : fCat(cat), fOut(out), fBaseOffset(SkToOffT(out->bytesWritten())) {
     }
 
-    void stream(SkPDFObject* obj) {
-        fCat->setFileOffset(obj, this->offset());
-        obj->emit(fOut, fCat, true);
+    void stream(SkPDFObject* object) {
+        fCat->setFileOffset(object, this->offset());
+        SkPDFObject* realObject = fCat->getSubstituteObject(object);
+        fCat->emitObjectNumber(fOut, realObject);
+        fOut->writeText(" obj\n");
+        realObject->emitObject(fOut, fCat);
+        fOut->writeText("\nendobj\n");
     }
 
     off_t offset() {
         return SkToOffT(fOut->bytesWritten()) - fBaseOffset;
     }
 
 private:
     SkPDFCatalog* const fCat;
     SkWStream* const fOut;
     const off_t fBaseOffset;
@@ skipping 240 matching lines @@
         fTrailerDict->insertInt("Size", int(objCount));
         fTrailerDict->insert("Root", new SkPDFObjRef(fDocCatalog))->unref();
     }
 
     stream->writeText("trailer\n");
     fTrailerDict->emitObject(stream, fCatalog.get());
     stream->writeText("\nstartxref\n");
     stream->writeBigDecAsText(fXRefFileOffset);
     stream->writeText("\n%%EOF");
 }