SKPDF: refactor pdfcatalog and pdfdocument

src/pdf/SkPDFTypes.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"
 #include "SkPDFTypes.h"
 #include "SkStream.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define SNPRINTF    _snprintf
 #else
     #define SNPRINTF    snprintf
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {
     SkSafeRef(obj);
 }
 
 SkPDFObjRef::~SkPDFObjRef() {}
 
 void SkPDFObjRef::emitObject(SkWStream* stream, SkPDFCatalog* catalog) {
-    stream->writeDecAsText(catalog->getObjectNumber(fObj.get()));
+    SkPDFObject* obj = catalog->getSubstituteObject(fObj);
+    stream->writeDecAsText(catalog->getObjectNumber(obj));
     stream->writeText(" 0 R");  // Generation number is always 0.
 }
 
 void SkPDFObjRef::addResources(SkTSet<SkPDFObject*>* resourceSet,
                                SkPDFCatalog* catalog) const {
     SkPDFObject* obj = catalog->getSubstituteObject(fObj);
     SkASSERT(obj);
     if (resourceSet->add(obj)) {
         obj->addResources(resourceSet, catalog);
     }
@@ skipping 351 matching lines @@
         }
     }
 }
 
 void SkPDFDict::mergeFrom(const SkPDFDict& other) {
     for (int i = 0; i < other.fValue.count(); i++) {
         *(fValue.append()) =
                 Rec(SkRef(other.fValue[i].key), SkRef(other.fValue[i].value));
     }
 }