SkPDF SkPDFObject::addResources signature simplified

SkPDF SkPDFObject::addResources signature simplified

-   SkPDFcatalog keeps a ordered list of object pointers
-   Elimiante SkTSet template class
-   SkPDFObject::addResources signature changes

BUG=skia:3585
Committed: https://skia.googlesource.com/skia/+/d4714af018158c15e13439bef2c9b5bafc25c1d7

[hal.canary, 2015-03-25 19:26:12]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2015-03-25 19:26:25]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1038523004/20001

[commit-bot: I haz the power, 2015-03-25 19:26:25]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-26 01:26 UTC

[commit-bot: I haz the power, 2015-03-25 19:26:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-25 19:26:31]

Failed to apply patch for src/pdf/SkPDFDocument.cpp:
While running git apply --index -3 -p1;
  error: src/pdf/SkPDFDocument.cpp: does not exist in index

Patch:       src/pdf/SkPDFDocument.cpp
Index: src/pdf/SkPDFDocument.cpp
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index
5f86598c08e27f882f320b3b9bb56e1801d88a09..690ef85bfebdc9fe876791ef6f8435102914a5eb
100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -109,19 +109,14 @@ bool SkPDFDocument::EmitPDF(const SkTDArray<const
SkPDFDevice*>& pageDevices,
     // Build font subsetting info before proceeding.
     perform_font_subsetting(&catalog, pages);
 
-    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);

[hal.canary, 2015-03-25 19:27:12]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2015-03-25 19:27:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1038523004/30013

[commit-bot: I haz the power, 2015-03-25 19:27:36]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-26 01:27 UTC

[hal.canary, 2015-03-25 19:54:26]

halcanary@google.com changed reviewers:
+ mtklein@google.com

[hal.canary, 2015-03-25 19:54:27]

PTAL (help me kill SkTSet).

[mtklein, 2015-03-25 20:13:13]

The CQ bit was checked by mtklein@google.com

[mtklein, 2015-03-25 20:13:13]

lgtm

[commit-bot: I haz the power, 2015-03-25 20:13:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1038523004/50001

[commit-bot: I haz the power, 2015-03-25 20:23:16]

Committed patchset #4 (id:50001) as
https://skia.googlesource.com/skia/+/d4714af018158c15e13439bef2c9b5bafc25c1d7