SkPDF: clean up uses of deprecated calls in other SkPDF classes

src/pdf/SkPDFBitmap.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkFlate.h"
@@ skipping 304 matching lines @@
 static SkPDFArray* make_indexed_color_space(const SkColorTable* table) {
     SkPDFArray* result = SkNEW(SkPDFArray);
     result->reserve(4);
     result->appendName("Indexed");
     result->appendName("DeviceRGB");
     SkASSERT(table);
     if (table->count() < 1) {
         result->appendInt(0);
         char shortTableArray[3] = {0, 0, 0};
         SkString tableString(shortTableArray, SK_ARRAY_COUNT(shortTableArray));
-        result->append(new SkPDFString(tableString))->unref();
+        result->appendString(tableString);
         return result;
     }
     result->appendInt(table->count() - 1);  // maximum color index.
 
     // Potentially, this could be represented in fewer bytes with a stream.
     // Max size as a string is 1.5k.
     char tableArray[256 * 3];
     SkASSERT(3u * table->count() <= SK_ARRAY_COUNT(tableArray));
     uint8_t* tablePtr = reinterpret_cast<uint8_t*>(tableArray);
     const SkPMColor* colors = table->readColors();
     for (int i = 0; i < table->count(); i++) {
         pmcolor_to_rgb24(colors[i], tablePtr);
         tablePtr += 3;
     }
     SkString tableString(tableArray, 3 * table->count());
-    result->append(new SkPDFString(tableString))->unref();
+    result->appendString(tableString);
     return result;
 }
 
 void PDFDefaultBitmap::emitObject(SkWStream* stream,
                                   const SkPDFObjNumMap& objNumMap,
                                   const SkPDFSubstituteMap& substitutes) {
     SkAutoLockPixels autoLockPixels(fBitmap);
     SkASSERT(fBitmap.colorType() != kIndex_8_SkColorType ||
              fBitmap.getColorTable());
 
     // Write to a temporary buffer to get the compressed length.
     SkDynamicMemoryWStream buffer;
     SkDeflateWStream deflateWStream(&buffer);
     bitmap_to_pdf_pixels(fBitmap, &deflateWStream);
     deflateWStream.finalize();  // call before detachAsStream().
     SkAutoTDelete<SkStreamAsset> asset(buffer.detachAsStream());
 
     SkPDFDict pdfDict("XObject");
     pdfDict.insertName("Subtype", "Image");
     pdfDict.insertInt("Width", fBitmap.width());
     pdfDict.insertInt("Height", fBitmap.height());
     if (fBitmap.colorType() == kIndex_8_SkColorType) {
         SkASSERT(1 == pdf_color_component_count(fBitmap.colorType()));
-        pdfDict.insert("ColorSpace", make_indexed_color_space(
-                                             fBitmap.getColorTable()))->unref();
+        pdfDict.insertObject("ColorSpace",
+                             make_indexed_color_space(fBitmap.getColorTable()));
     } else if (1 == pdf_color_component_count(fBitmap.colorType())) {
         pdfDict.insertName("ColorSpace", "DeviceGray");
     } else {
         pdfDict.insertName("ColorSpace", "DeviceRGB");
     }
     pdfDict.insertInt("BitsPerComponent", 8);
     if (fSMask) {
-        pdfDict.insert("SMask", new SkPDFObjRef(fSMask))->unref();
+        pdfDict.insertObjRef("SMask", SkRef(fSMask.get()));
     }
     pdfDict.insertName("Filter", "FlateDecode");
     pdfDict.insertInt("Length", asset->getLength());
     pdfDict.emitObject(stream, objNumMap, substitutes);
 
     pdf_stream_begin(stream);
     stream->writeStream(asset.get(), asset->getLength());
     pdf_stream_end(stream);
 }
 
@@ skipping 88 matching lines @@
     }
 
     SkPDFObject* smask = NULL;
     if (!bm.isOpaque() && !SkBitmap::ComputeIsOpaque(bm)) {
         smask = SkNEW_ARGS(PDFAlphaBitmap, (bm));
     }
     SkPDFBitmap* pdfBitmap = SkNEW_ARGS(PDFDefaultBitmap, (bm, smask));
     canon->addBitmap(pdfBitmap);
     return pdfBitmap;
 }