SkPDF SkPDFObject::addResources signature simplified

src/doc/SkDocument_PDF.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 "SkDocument.h"
 #include "SkPDFCanon.h"
 #include "SkPDFCatalog.h"
@@ skipping 193 matching lines @@
     */
 
     if (dests->size() > 0) {
         docCatalog->insert("Dests", SkNEW_ARGS(SkPDFObjRef, (dests.get())))
                 ->unref();
     }
 
     // Build font subsetting info before proceeding.
     perform_font_subsetting(pageDevices, &catalog);
 
-    SkTSet<SkPDFObject*> resourceSet;
-    if (resourceSet.add(docCatalog.get())) {
-        docCatalog->addResources(&resourceSet, &catalog);
+    if (catalog.addObject(docCatalog.get())) {
+        docCatalog->addResources(&catalog);
     }
-    for (int i = 0; i < resourceSet.count(); ++i) {
-        SkAssertResult(catalog.addObject(resourceSet[i]));
-    }
-
     size_t baseOffset = SkToOffT(stream->bytesWritten());
     emit_pdf_header(stream);
     SkTDArray<int32_t> offsets;
-    for (int i = 0; i < resourceSet.count(); ++i) {
-        SkPDFObject* object = resourceSet[i];
+    for (int i = 0; i < catalog.objects().count(); ++i) {
+        SkPDFObject* object = catalog.objects()[i];
         offsets.push(SkToS32(stream->bytesWritten() - baseOffset));
         SkASSERT(object == catalog.getSubstituteObject(object));
         SkASSERT(catalog.getObjectNumber(object) == i + 1);
         stream->writeDecAsText(i + 1);
         stream->writeText(" 0 obj\n");  // Generation number is always 0.
         object->emitObject(stream, &catalog);
         stream->writeText("\nendobj\n");
     }
     int32_t xRefFileOffset = SkToS32(stream->bytesWritten() - baseOffset);
 
@@ skipping 126 matching lines @@
 
 SkDocument* SkDocument::CreatePDF(const char path[], SkScalar dpi) {
     SkFILEWStream* stream = SkNEW_ARGS(SkFILEWStream, (path));
     if (!stream->isValid()) {
         SkDELETE(stream);
         return NULL;
     }
     auto delete_wstream = [](SkWStream* stream, bool) { SkDELETE(stream); };
     return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, dpi));
 }