SkPDF: Refactor SkPDFObject heiararchy.

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 51 matching lines @@
                               const char* expectedData, size_t expectedSize,
                               bool indirect) {
     SkPDFSubstituteMap substituteMap;
     SkPDFObjNumMap catalog;
     size_t directSize = get_output_size(obj, catalog, substituteMap, false);
     REPORTER_ASSERT(reporter, directSize == expectedSize);
 
     SkDynamicMemoryWStream buffer;
     emit_object(obj, &buffer, catalog, substituteMap, false);
     REPORTER_ASSERT(reporter, directSize == buffer.getOffset());
-    REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedData,
-                                            directSize));
+    if (!stream_equals(buffer, 0, expectedData, directSize)) {
+        SkAutoTDelete<SkStreamAsset> asset(buffer.detachAsStream());
+        SkString s(asset->getLength());
+        asset->read(s.writable_str(), s.size());
+        ERRORF(reporter, "!stream_equals() '%s' '%s'", expectedData, s.c_str());
+    }
 
     if (indirect) {
         // Indirect output.
         static char header[] = "1 0 obj\n";
         static size_t headerLen = strlen(header);
         static char footer[] = "\nendobj\n";
         static size_t footerLen = strlen(footer);
 
         catalog.addObject(obj);
 
@@ skipping 181 matching lines @@
     array->append(int42.get());
     SimpleCheckObjectOutput(reporter, array.get(), "[42]");
     array->append(realHalf.get());
     SimpleCheckObjectOutput(reporter, array.get(), "[42 0.5]");
     SkAutoTUnref<SkPDFInt> int0(new SkPDFInt(0));
     array->append(int0.get());
     SimpleCheckObjectOutput(reporter, array.get(), "[42 0.5 0]");
 
     SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
     SimpleCheckObjectOutput(reporter, dict.get(), "<<>>");
-    SkAutoTUnref<SkPDFName> n1(new SkPDFName("n1"));
-    dict->insert(n1.get(), int42.get());
+    dict->insert("n1", int42.get());
     SimpleCheckObjectOutput(reporter, dict.get(), "<</n1 42>>");
-    SkAutoTUnref<SkPDFName> n2(new SkPDFName("n2"));
-    SkAutoTUnref<SkPDFName> n3(new SkPDFName("n3"));
-    dict->insert(n2.get(), realHalf.get());
-    dict->insert(n3.get(), array.get());
+    SkString n3("n3");
+    dict->insert("n2", realHalf.get());
+    dict->insertObject(n3, array.detach());
     SimpleCheckObjectOutput(reporter, dict.get(),
                             "<</n1 42\n/n2 0.5\n/n3 [42 0.5 0]>>");
 
     TestPDFStream(reporter);
 
     TestCatalog(reporter);
 
     TestObjectRef(reporter);
 
     TestSubstitute(reporter);
@@ skipping 49 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);
     doc->close();
 
     // Filter was used in rendering; should be visited.
     REPORTER_ASSERT(reporter, filter->visited());
 }