Simplify reference management in SkPDF

tests/PDFPrimitivesTest.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 183 matching lines @@
     SkAutoTUnref<SkPDFInt> int1(new SkPDFInt(1));
     SkAutoTUnref<SkPDFInt> int2(new SkPDFInt(2));
     SkAutoTUnref<SkPDFInt> int3(new SkPDFInt(3));
     int1.get()->ref();
     SkAutoTUnref<SkPDFInt> int1Again(int1.get());
 
     catalog.addObject(int1.get(), false);
     catalog.addObject(int2.get(), false);
     catalog.addObject(int3.get(), false);
 
-    REPORTER_ASSERT(reporter, catalog.getObjectNumberSize(int1.get()) == 3);
-    REPORTER_ASSERT(reporter, catalog.getObjectNumberSize(int2.get()) == 3);
-    REPORTER_ASSERT(reporter, catalog.getObjectNumberSize(int3.get()) == 3);
-
     SkDynamicMemoryWStream buffer;
     catalog.emitObjectNumber(&buffer, int1.get());
     catalog.emitObjectNumber(&buffer, int2.get());
     catalog.emitObjectNumber(&buffer, int3.get());
     catalog.emitObjectNumber(&buffer, int1Again.get());
     char expectedResult[] = "1 02 03 01 0";
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResult,
                                             strlen(expectedResult)));
 }
 
 static void TestObjectRef(skiatest::Reporter* reporter) {
     SkAutoTUnref<SkPDFInt> int1(new SkPDFInt(1));
     SkAutoTUnref<SkPDFInt> int2(new SkPDFInt(2));
     SkAutoTUnref<SkPDFObjRef> int2ref(new SkPDFObjRef(int2.get()));
 
     SkPDFCatalog catalog((SkPDFDocument::Flags)0);
     catalog.addObject(int1.get(), false);
     catalog.addObject(int2.get(), false);
-    REPORTER_ASSERT(reporter, catalog.getObjectNumberSize(int1.get()) == 3);
-    REPORTER_ASSERT(reporter, catalog.getObjectNumberSize(int2.get()) == 3);
 
     char expectedResult[] = "2 0 R";
     SkDynamicMemoryWStream buffer;
     int2ref->emitObject(&buffer, &catalog);
     REPORTER_ASSERT(reporter, buffer.getOffset() == strlen(expectedResult));
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResult,
                                             buffer.getOffset()));
 }
 
 static void TestSubstitute(skiatest::Reporter* reporter) {
     SkAutoTUnref<SkPDFTestDict> proxy(new SkPDFTestDict());
     SkAutoTUnref<SkPDFTestDict> stub(new SkPDFTestDict());
-    SkAutoTUnref<SkPDFInt> int33(new SkPDFInt(33));
-    SkAutoTUnref<SkPDFDict> stubResource(new SkPDFDict());
-    SkAutoTUnref<SkPDFInt> int44(new SkPDFInt(44));
 
-    stub->insert("Value", int33.get());
-    stubResource->insert("InnerValue", int44.get());
-    stub->addResource(stubResource.get());
+    proxy->insert("Value", new SkPDFInt(33))->unref();
+    stub->insert("Value", new SkPDFInt(44))->unref();
 
     SkPDFCatalog catalog((SkPDFDocument::Flags)0);
     catalog.addObject(proxy.get(), false);
     catalog.setSubstitute(proxy.get(), stub.get());
 
-    SkDynamicMemoryWStream buffer;
-    emit_object(proxy, &buffer, &catalog, false);
-    SkTSet<SkPDFObject*>* substituteResources =
-            catalog.getSubstituteList(false);
-    for (int i = 0; i < substituteResources->count(); ++i) {
-        emit_object((*substituteResources)[i], &buffer, &catalog, true);
-    }
-
-    char objectResult[] = "2 0 obj\n<</Value 33\n>>\nendobj\n";
-    catalog.setFileOffset(proxy.get(), 0);
-
-    size_t outputSize = get_output_size(
-            catalog.getSubstituteObject(proxy.get()), &catalog, true);
-    REPORTER_ASSERT(reporter, outputSize == strlen(objectResult));
-
-    char expectedResult[] =
-        "<</Value 33\n>>1 0 obj\n<</InnerValue 44\n>>\nendobj\n";
-    REPORTER_ASSERT(reporter, buffer.getOffset() == strlen(expectedResult));
-    REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResult,
-                                            buffer.getOffset()));
+    REPORTER_ASSERT(reporter, stub.get() == catalog.getSubstituteObject(proxy));
+    REPORTER_ASSERT(reporter, proxy.get() != catalog.getSubstituteObject(stub));
 }
 
 // Create a bitmap that would be very eficiently compressed in a ZIP.
 static void setup_bitmap(SkBitmap* bitmap, int width, int height) {
     bitmap->allocN32Pixels(width, height);
     bitmap->eraseColor(SK_ColorWHITE);
 }
 
 static void TestImage(skiatest::Reporter* reporter, const SkBitmap& bitmap,
                       const char* expected, bool useDCTEncoder) {
@@ skipping 223 matching lines @@
 
     // Filter just created; should be unvisited.
     REPORTER_ASSERT(reporter, !filter->visited());
     SkPaint paint;
     paint.setImageFilter(filter.get());
     canvas.drawRect(SkRect::MakeWH(100, 100), paint);
 
     // Filter was used in rendering; should be visited.
     REPORTER_ASSERT(reporter, filter->visited());
 }