SkPDF: consolidate two functions in SkPDFObjNumMap

Change-Id: Id815920e664ba986258867b7c35a7618a6927b0f
Reviewed-on: https://skia-review.googlesource.com/54360
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index c256ff9..c1505ea 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -576,17 +576,10 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool SkPDFObjNumMap::addObject(SkPDFObject* obj) {
-    if (fObjectNumbers.find(obj)) {
-        return false;
-    }
-    fObjectNumbers.set(obj, fObjectNumbers.count() + 1);
-    fObjects.emplace_back(sk_ref_sp(obj));
-    return true;
-}
-
 void SkPDFObjNumMap::addObjectRecursively(SkPDFObject* obj) {
-    if (obj && this->addObject(obj)) {
+    if (obj && !fObjectNumbers.find(obj)) {
+        fObjectNumbers.set(obj, fObjectNumbers.count() + 1);
+        fObjects.emplace_back(sk_ref_sp(obj));
         obj->addResources(this);
     }
 }
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h
index af5cdaf..c393376 100644
--- a/src/pdf/SkPDFTypes.h
+++ b/src/pdf/SkPDFTypes.h
@@ -359,12 +359,6 @@
 */
 class SkPDFObjNumMap : SkNoncopyable {
 public:
-    /** Add the passed object to the catalog.
-     *  @param obj         The object to add.
-     *  @return True iff the object was not already added to the catalog.
-     */
-    bool addObject(SkPDFObject* obj);
-
     /** Add the passed object to the catalog, as well as all its dependencies.
      *  @param obj   The object to add.  If nullptr, this is a noop.
      */
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index ed74850..8c6b03c 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -126,9 +126,9 @@
     sk_sp<SkPDFArray> a2(new SkPDFArray);
     sk_sp<SkPDFArray> a3(new SkPDFArray);
 
-    objNumMap.addObject(a1.get());
-    objNumMap.addObject(a2.get());
-    objNumMap.addObject(a3.get());
+    objNumMap.addObjectRecursively(a1.get());
+    objNumMap.addObjectRecursively(a2.get());
+    objNumMap.addObjectRecursively(a3.get());
 
     // The objects should be numbered in the order they are added,
     // starting with 1.
@@ -146,7 +146,7 @@
     a2->appendObjRef(a1);
 
     SkPDFObjNumMap catalog;
-    catalog.addObject(a1.get());
+    catalog.addObjectRecursively(a1.get());
     REPORTER_ASSERT(reporter, catalog.getObjectNumber(a1.get()) == 1);
 
     SkString result = emit_to_string(*a2, &catalog);
@@ -265,7 +265,7 @@
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     SkPDFObjNumMap catalog;
-    catalog.addObject(referencedArray.get());
+    catalog.addObjectRecursively(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.getObjectNumber(
                             referencedArray.get()) == 1);
     array->appendObjRef(std::move(referencedArray));
@@ -329,7 +329,7 @@
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     SkPDFObjNumMap catalog;
-    catalog.addObject(referencedArray.get());
+    catalog.addObjectRecursively(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.getObjectNumber(
                             referencedArray.get()) == 1);
     dict->insertObjRef("n1", std::move(referencedArray));