Cleanup SkPDFObject::emit*

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 @@
 
     for (size_t offset = 0 ; offset < data->size() - len; offset++) {
         if (memcmp(data->bytes() + offset, buffer, len) == 0) {
             return true;
         }
     }
 
     return false;
 }
 
+static void emit_object(SkPDFObject* object,
+                        SkWStream* stream,
+                        SkPDFCatalog* catalog,
+                        bool indirect) {
+    SkPDFObject* realObject = catalog->getSubstituteObject(object);
+    if (indirect) {
+        catalog->emitObjectNumber(stream, realObject);
+        stream->writeText(" obj\n");
+        realObject->emitObject(stream, catalog);
+        stream->writeText("\nendobj\n");
+    } else {
+        realObject->emitObject(stream, catalog);
+    }
+}
+
+static size_t get_output_size(SkPDFObject* object,
+                              SkPDFCatalog* catalog,
+                              bool indirect) {
+    SkDynamicMemoryWStream buffer;
+    emit_object(object, &buffer, catalog, indirect);
+    return buffer.getOffset();
+}
+
 static void CheckObjectOutput(skiatest::Reporter* reporter, SkPDFObject* obj,
                               const char* expectedData, size_t expectedSize,
                               bool indirect, bool compression) {
     SkPDFDocument::Flags docFlags = (SkPDFDocument::Flags) 0;
     if (!compression) {
         docFlags = SkTBitOr(docFlags, SkPDFDocument::kFavorSpeedOverSize_Flags);
     }
     SkPDFCatalog catalog(docFlags);
-    size_t directSize = obj->getOutputSize(&catalog, false);
+    size_t directSize = get_output_size(obj, &catalog, false);
     REPORTER_ASSERT(reporter, directSize == expectedSize);
 
     SkDynamicMemoryWStream buffer;
-    obj->emit(&buffer, &catalog, false);
+    emit_object(obj, &buffer, &catalog, false);
     REPORTER_ASSERT(reporter, directSize == buffer.getOffset());
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedData,
                                             directSize));
 
     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, false);
 
-        size_t indirectSize = obj->getOutputSize(&catalog, true);
+        size_t indirectSize = get_output_size(obj, &catalog, true);
         REPORTER_ASSERT(reporter,
                         indirectSize == directSize + headerLen + footerLen);
 
         buffer.reset();
-        obj->emit(&buffer, &catalog, true);
+        emit_object(obj, &buffer, &catalog, true);
         REPORTER_ASSERT(reporter, indirectSize == buffer.getOffset());
         REPORTER_ASSERT(reporter, stream_equals(buffer, 0, header, headerLen));
         REPORTER_ASSERT(reporter, stream_equals(buffer, headerLen, expectedData,
                                                 directSize));
         REPORTER_ASSERT(reporter, stream_equals(buffer, headerLen + directSize,
                                                 footer, footerLen));
     }
 }
 
 static void SimpleCheckObjectOutput(skiatest::Reporter* reporter,
@@ skipping 106 matching lines @@
 
     stub->insert("Value", int33.get());
     stubResource->insert("InnerValue", int44.get());
     stub->addResource(stubResource.get());
 
     SkPDFCatalog catalog((SkPDFDocument::Flags)0);
     catalog.addObject(proxy.get(), false);
     catalog.setSubstitute(proxy.get(), stub.get());
 
     SkDynamicMemoryWStream buffer;
-    proxy->emit(&buffer, &catalog, false);
+    emit_object(proxy, &buffer, &catalog, false);
     SkTSet<SkPDFObject*>* substituteResources =
             catalog.getSubstituteList(false);
     for (int i = 0; i < substituteResources->count(); ++i) {
-        (*substituteResources)[i]->emit(&buffer, &catalog, true);
+        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 = catalog.getSubstituteObject(proxy.get())
-                                ->getOutputSize(&catalog, true);
+    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()));
 }
 
 // Create a bitmap that would be very eficiently compressed in a ZIP.
@@ skipping 230 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());
 }