SkPDF: Add sk_sp setters; .release() becomes std::move()

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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 65 matching lines @@
         SkString result = emit_to_string(OBJECT);         \
         ASSERT_EQ(REPORTER, result, STRING);              \
     } while (false)
 
 
 
 static void TestPDFStream(skiatest::Reporter* reporter) {
     char streamBytes[] = "Test\nFoo\tBar";
     SkAutoTDelete<SkMemoryStream> streamData(new SkMemoryStream(
         streamBytes, strlen(streamBytes), true));
-    SkAutoTUnref<SkPDFStream> stream(new SkPDFStream(streamData.get()));
+    sk_sp<SkPDFStream> stream(new SkPDFStream(streamData.get()));
     ASSERT_EMIT_EQ(reporter,
                    *stream,
                    "<</Length 12>> stream\nTest\nFoo\tBar\nendstream");
     stream->insertInt("Attribute", 42);
     ASSERT_EMIT_EQ(reporter,
                    *stream,
                    "<</Length 12\n/Attribute 42>> stream\n"
                    "Test\nFoo\tBar\nendstream");
 
     {
         char streamBytes2[] = "This is a longer string, so that compression "
                               "can do something with it. With shorter strings, "
                               "the short circuit logic cuts in and we end up "
                               "with an uncompressed string.";
         SkAutoDataUnref streamData2(SkData::NewWithCopy(streamBytes2,
                                                         strlen(streamBytes2)));
-        SkAutoTUnref<SkPDFStream> stream(new SkPDFStream(streamData2.get()));
+        sk_sp<SkPDFStream> stream(new SkPDFStream(streamData2.get()));
 
         SkDynamicMemoryWStream compressedByteStream;
         SkDeflateWStream deflateWStream(&compressedByteStream);
         deflateWStream.write(streamBytes2, strlen(streamBytes2));
         deflateWStream.finalize();
 
         SkDynamicMemoryWStream expected;
         expected.writeText("<</Filter /FlateDecode\n/Length 116>> stream\n");
         compressedByteStream.writeToStream(&expected);
         compressedByteStream.reset();
         expected.writeText("\nendstream");
         SkAutoDataUnref expectedResultData2(expected.copyToData());
         SkString result = emit_to_string(*stream);
         ASSERT_EQL(reporter,
                    result,
                    (const char*)expectedResultData2->data(),
                    expectedResultData2->size());
     }
 }
 
 static void TestObjectNumberMap(skiatest::Reporter* reporter) {
     SkPDFObjNumMap objNumMap;
-    SkAutoTUnref<SkPDFArray> a1(new SkPDFArray);
-    SkAutoTUnref<SkPDFArray> a2(new SkPDFArray);
-    SkAutoTUnref<SkPDFArray> a3(new SkPDFArray);
+    sk_sp<SkPDFArray> a1(new SkPDFArray);
+    sk_sp<SkPDFArray> a2(new SkPDFArray);
+    sk_sp<SkPDFArray> a3(new SkPDFArray);
 
     objNumMap.addObject(a1.get());
     objNumMap.addObject(a2.get());
     objNumMap.addObject(a3.get());
 
     // The objects should be numbered in the order they are added,
     // starting with 1.
     REPORTER_ASSERT(reporter, objNumMap.getObjectNumber(a1.get()) == 1);
     REPORTER_ASSERT(reporter, objNumMap.getObjectNumber(a2.get()) == 2);
     REPORTER_ASSERT(reporter, objNumMap.getObjectNumber(a3.get()) == 3);
     // Assert that repeated calls to get the object number return
     // consistent result.
     REPORTER_ASSERT(reporter, objNumMap.getObjectNumber(a1.get()) == 1);
 }
 
 static void TestObjectRef(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkPDFArray> a1(new SkPDFArray);
-    SkAutoTUnref<SkPDFArray> a2(new SkPDFArray);
-    a2->appendObjRef(SkRef(a1.get()));
+    sk_sp<SkPDFArray> a1(new SkPDFArray);
+    sk_sp<SkPDFArray> a2(new SkPDFArray);
+    a2->appendObjRef(a1);
 
     Catalog catalog;
     catalog.numbers.addObject(a1.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(a1.get()) == 1);
 
     SkString result = emit_to_string(*a2, &catalog);
     // If appendObjRef misbehaves, then the result would
     // be [[]], not [1 0 R].
     ASSERT_EQ(reporter, result, "[1 0 R]");
 }
 
 static void TestSubstitute(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkPDFDict> proxy(new SkPDFDict());
-    SkAutoTUnref<SkPDFDict> stub(new SkPDFDict());
+    sk_sp<SkPDFDict> proxy(new SkPDFDict());
+    sk_sp<SkPDFDict> stub(new SkPDFDict());
 
     proxy->insertInt("Value", 33);
     stub->insertInt("Value", 44);
 
     SkPDFSubstituteMap substituteMap;
     substituteMap.setSubstitute(proxy.get(), stub.get());
     SkPDFObjNumMap catalog;
     catalog.addObject(proxy.get());
 
-    REPORTER_ASSERT(reporter, stub.get() == substituteMap.getSubstitute(proxy));
-    REPORTER_ASSERT(reporter, proxy.get() != substituteMap.getSubstitute(stub));
+    REPORTER_ASSERT(reporter, stub.get() == substituteMap.getSubstitute(proxy.get()));
+    REPORTER_ASSERT(reporter, proxy.get() != substituteMap.getSubstitute(stub.get()));
 }
 
 // This test used to assert without the fix submitted for
 // http://code.google.com/p/skia/issues/detail?id=1083.
 // SKP files might have invalid glyph ids. This test ensures they are ignored,
 // and there is no assert on input data in Debug mode.
 static void test_issue1083() {
     SkDynamicMemoryWStream outStream;
-    SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(&outStream));
+    sk_sp<SkDocument> doc(SkDocument::CreatePDF(&outStream));
     SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
     SkPaint paint;
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
     uint16_t glyphID = 65000;
     canvas->drawText(&glyphID, 2, 0, 0, paint);
 
     doc->close();
 }
 
@@ skipping 39 matching lines @@
     SkPDFUnion name3 = SkPDFUnion::Name("SimpleNameWithOnlyPrintableASCII");
     ASSERT_EMIT_EQ(reporter, name3, "/SimpleNameWithOnlyPrintableASCII");
 
     // Test that we correctly handle characters with the high-bit set.
     SkString highBitString("\xDE\xAD" "be\xEF");
     SkPDFUnion highBitName = SkPDFUnion::Name(highBitString);
     ASSERT_EMIT_EQ(reporter, highBitName, "/#DE#ADbe#EF");
 }
 
 static void TestPDFArray(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkPDFArray> array(new SkPDFArray);
+    sk_sp<SkPDFArray> array(new SkPDFArray);
     ASSERT_EMIT_EQ(reporter, *array, "[]");
 
     array->appendInt(42);
     ASSERT_EMIT_EQ(reporter, *array, "[42]");
 
     array->appendScalar(SK_ScalarHalf);
     ASSERT_EMIT_EQ(reporter, *array, "[42 .5]");
 
     array->appendInt(0);
     ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0]");
 
     array->appendBool(true);
     ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true]");
 
     array->appendName("ThisName");
     ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true /ThisName]");
 
     array->appendName(SkString("AnotherName"));
     ASSERT_EMIT_EQ(reporter, *array, "[42 .5 0 true /ThisName /AnotherName]");
 
     array->appendString("This String");
     ASSERT_EMIT_EQ(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String)]");
 
     array->appendString(SkString("Another String"));
     ASSERT_EMIT_EQ(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String) "
                    "(Another String)]");
 
-    SkAutoTUnref<SkPDFArray> innerArray(new SkPDFArray);
+    sk_sp<SkPDFArray> innerArray(new SkPDFArray);
     innerArray->appendInt(-1);
-    array->appendObject(innerArray.detach());
+    array->appendObject(std::move(innerArray));
     ASSERT_EMIT_EQ(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String) "
                    "(Another String) [-1]]");
 
-    SkAutoTUnref<SkPDFArray> referencedArray(new SkPDFArray);
+    sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     Catalog catalog;
     catalog.numbers.addObject(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
                             referencedArray.get()) == 1);
-    array->appendObjRef(referencedArray.detach());
+    array->appendObjRef(std::move(referencedArray));
 
     SkString result = emit_to_string(*array, &catalog);
     ASSERT_EQ(reporter, result,
               "[42 .5 0 true /ThisName /AnotherName (This String) "
               "(Another String) [-1] 1 0 R]");
 }
 
 static void TestPDFDict(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
+    sk_sp<SkPDFDict> dict(new SkPDFDict);
     ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", SkToSizeT(42));
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42>>");
 
     dict.reset(new SkPDFDict);
     ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", 42);
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42>>");
 
     dict->insertScalar("n2", SK_ScalarHalf);
 
     SkString n3("n3");
-    SkAutoTUnref<SkPDFArray> innerArray(new SkPDFArray);
+    sk_sp<SkPDFArray> innerArray(new SkPDFArray);
     innerArray->appendInt(-100);
-    dict->insertObject(n3, innerArray.detach());
+    dict->insertObject(n3, std::move(innerArray));
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 42\n/n2 .5\n/n3 [-100]>>");
 
     dict.reset(new SkPDFDict);
     ASSERT_EMIT_EQ(reporter, *dict, "<<>>");
 
     dict->insertInt("n1", 24);
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24>>");
 
     dict->insertInt("n2", SkToSizeT(99));
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99>>");
@@ skipping 12 matching lines @@
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName\n/n6 (A String)>>");
 
     dict->insertString("n7", SkString("Another String"));
     ASSERT_EMIT_EQ(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName\n/n6 (A String)\n/n7 (Another String)>>");
 
     dict.reset(new SkPDFDict("DType"));
     ASSERT_EMIT_EQ(reporter, *dict, "<</Type /DType>>");
 
-    SkAutoTUnref<SkPDFArray> referencedArray(new SkPDFArray);
+    sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
     Catalog catalog;
     catalog.numbers.addObject(referencedArray.get());
     REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
                             referencedArray.get()) == 1);
-    dict->insertObjRef("n1", referencedArray.detach());
+    dict->insertObjRef("n1", std::move(referencedArray));
     SkString result = emit_to_string(*dict, &catalog);
     ASSERT_EQ(reporter, result, "<</Type /DType\n/n1 1 0 R>>");
 }
 
 DEF_TEST(PDFPrimitives, reporter) {
     TestPDFUnion(reporter);
     TestPDFArray(reporter);
     TestPDFDict(reporter);
     TestPDFStream(reporter);
     TestObjectNumberMap(reporter);
@@ skipping 35 matching lines @@
     str->append(")");
 }
 #endif
 
 };
 
 // Check that PDF rendering of image filters successfully falls back to
 // CPU rasterization.
 DEF_TEST(PDFImageFilter, reporter) {
     SkDynamicMemoryWStream stream;
-    SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(&stream));
+    sk_sp<SkDocument> doc(SkDocument::CreatePDF(&stream));
     SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
 
-    SkAutoTUnref<DummyImageFilter> filter(new DummyImageFilter());
+    sk_sp<DummyImageFilter> filter(new DummyImageFilter());
 
     // 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());
 }
 
 // Check that PDF rendering of image filters successfully falls back to
 // CPU rasterization.
 DEF_TEST(PDFFontCanEmbedTypeface, reporter) {
     SkPDFCanon canon;
 
     const char resource[] = "fonts/Roboto2-Regular_NoEmbed.ttf";
-    SkAutoTUnref<SkTypeface> noEmbedTypeface(GetResourceAsTypeface(resource));
+    sk_sp<SkTypeface> noEmbedTypeface(GetResourceAsTypeface(resource));
     if (noEmbedTypeface) {
         REPORTER_ASSERT(reporter,
-                        !SkPDFFont::CanEmbedTypeface(noEmbedTypeface, &canon));
+                        !SkPDFFont::CanEmbedTypeface(noEmbedTypeface.get(), &canon));
     }
-    SkAutoTUnref<SkTypeface> portableTypeface(
+    sk_sp<SkTypeface> portableTypeface(
             sk_tool_utils::create_portable_typeface(NULL, SkTypeface::kNormal));
     REPORTER_ASSERT(reporter,
-                    SkPDFFont::CanEmbedTypeface(portableTypeface, &canon));
+                    SkPDFFont::CanEmbedTypeface(portableTypeface.get(), &canon));
 }
 
 
 // test to see that all finite scalars round trip via scanf().
 static void check_pdf_scalar_serialization(
         skiatest::Reporter* reporter, float inputFloat) {
     char floatString[SkPDFUtils::kMaximumFloatDecimalLength];
     size_t len = SkPDFUtils::FloatToDecimal(inputFloat, floatString);
     if (len >= sizeof(floatString)) {
         ERRORF(reporter, "string too long: %u", (unsigned)len);
@@ skipping 30 matching lines @@
     float alwaysCheck[] = {
         0.0f, -0.0f, 1.0f, -1.0f, SK_ScalarPI, 0.1f, FLT_MIN, FLT_MAX,
         -FLT_MIN, -FLT_MAX, FLT_MIN / 16.0f, -FLT_MIN / 16.0f,
         SK_FloatNaN, SK_FloatInfinity, SK_FloatNegativeInfinity,
         -FLT_MIN / 8388608.0
     };
     for (float inputFloat: alwaysCheck) {
         check_pdf_scalar_serialization(reporter, inputFloat);
     }
 }