SkPDF: PDFDevice use SkTArray<T> rather than SkTDArray<T*>

src/pdf/SkPDFDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPDFDevice_DEFINED
 #define SkPDFDevice_DEFINED
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
+#include "SkData.h"
 #include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 
 class SkPDFArray;
 class SkPDFCanon;
 class SkPDFDevice;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
 class SkPDFGlyphSetMap;
 class SkPDFGraphicState;
 class SkPDFObject;
 class SkPDFShader;
 class SkPDFStream;
 class SkRRect;
 
 // Private classes.
 struct ContentEntry;
 struct GraphicStateEntry;
-struct NamedDestination;
-struct RectWithData;
 
 /** \class SkPDFDevice
 
     The drawing context for the PDF backend.
 */
 class SkPDFDevice final : public SkBaseDevice {
 public:
     /** Create a PDF drawing context.  SkPDFDevice applies a
      *  scale-and-translate transform to move the origin from the
      *  bottom left (PDF default) to the top left (Skia default).
@@ skipping 140 matching lines @@
     SkPDFCanon* getCanon() const { return fCanon; }
 
 protected:
     const SkBitmap& onAccessBitmap() override {
         return fLegacyBitmap;
     }
 
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
 
 private:
+    struct RectWithData {
+        SkRect rect;
+        SkData* data;
+        RectWithData(const SkRect& rect, SkData* data)
+            : rect(rect), data(SkRef(data)) {}
+        ~RectWithData() { data->unref(); }
+    };
+
+    struct NamedDestination {
+        SkData* nameData;
+        SkPoint point;
+        NamedDestination(SkData* nameData, const SkPoint& point)
+            : nameData(SkRef(nameData)), point(point) {}
+        ~NamedDestination() { nameData->unref(); }
+    };
+
     // TODO(vandebo): push most of SkPDFDevice's state into a core object in
     // order to get the right access levels without using friend.
     friend class ScopedContentEntry;
 
     SkISize fPageSize;
     SkISize fContentSize;
     SkMatrix fInitialTransform;
     SkClipStack fExistingClipStack;
     SkRegion fExistingClipRegion;
 
-    SkTDArray<RectWithData*> fLinkToURLs;
-    SkTDArray<RectWithData*> fLinkToDestinations;
-    SkTDArray<NamedDestination*> fNamedDestinations;
+    SkTArray<RectWithData> fLinkToURLs;
+    SkTArray<RectWithData> fLinkToDestinations;
+    SkTArray<NamedDestination> fNamedDestinations;
 
     SkTDArray<SkPDFObject*> fGraphicStateResources;
     SkTDArray<SkPDFObject*> fXObjectResources;
     SkTDArray<SkPDFFont*> fFontResources;
     SkTDArray<SkPDFObject*> fShaderResources;
 
     SkAutoTDelete<ContentEntry> fContentEntries;
     ContentEntry* fLastContentEntry;
     SkAutoTDelete<ContentEntry> fMarginContentEntries;
     ContentEntry* fLastMarginContentEntry;
@@ skipping 85 matching lines @@
 
     typedef SkBaseDevice INHERITED;
 
     // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
     // an SkPDFDevice
     //friend class SkDocument_PDF;
     //friend class SkPDFImageShader;
 };
 
 #endif