Replace SkTScopedPtr with SkAutoTDelete in Skia.

include/core/SkAdvancedTypefaceMetrics.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 SkAdvancedTypefaceMetrics_DEFINED
 #define SkAdvancedTypefaceMetrics_DEFINED
 
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
-#include "SkTScopedPtr.h"
 
 /** \class SkAdvancedTypefaceMetrics
 
     The SkAdvancedTypefaceMetrics class is used by the PDF backend to correctly
     embed typefaces.  This class is filled in with information about a given
     typeface by the SkFontHost class.
 */
 
 class SkAdvancedTypefaceMetrics : public SkRefCnt {
 public:
@@ skipping 54 matching lines @@
     struct AdvanceMetric {
         enum MetricType {
             kDefault,  // Default advance: fAdvance.count = 1
             kRange,    // Advances for a range: fAdvance.count = fEndID-fStartID
             kRun       // fStartID-fEndID have same advance: fAdvance.count = 1
         };
         MetricType fType;
         uint16_t fStartId;
         uint16_t fEndId;
         SkTDArray<Data> fAdvance;
-        SkTScopedPtr<AdvanceMetric<Data> > fNext;
+        SkAutoTDelete<AdvanceMetric<Data> > fNext;
     };
 
     struct VerticalMetric {
         int16_t fVerticalAdvance;
         int16_t fOriginXDisp;  // Horiz. displacement of the secondary origin.
         int16_t fOriginYDisp;  // Vert. displacement of the secondary origin.
     };
     typedef AdvanceMetric<int16_t> WidthRange;
     typedef AdvanceMetric<VerticalMetric> VerticalAdvanceRange;
 
     // This is indexed by glyph id.
-    SkTScopedPtr<WidthRange> fGlyphWidths;
+    SkAutoTDelete<WidthRange> fGlyphWidths;
     // Only used for Vertical CID fonts.
-    SkTScopedPtr<VerticalAdvanceRange> fVerticalMetrics;
+    SkAutoTDelete<VerticalAdvanceRange> fVerticalMetrics;
 
     // The names of each glyph, only populated for postscript fonts.
-    SkTScopedPtr<SkAutoTArray<SkString> > fGlyphNames;
+    SkAutoTDelete<SkAutoTArray<SkString> > fGlyphNames;
 
     // The mapping from glyph to Unicode, only populated if
     // kToUnicode_PerGlyphInfo is passed to GetAdvancedTypefaceMetrics.
     SkTDArray<SkUnichar> fGlyphToUnicode;
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
 namespace skia_advanced_typeface_metrics_utils {
 
 template <typename Data>
 void resetRange(SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* range,
                        int startId);
 
 template <typename Data>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
         int startId);
 
 template <typename Data>
 void finishRange(
         SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* range,
         int endId,
         typename SkAdvancedTypefaceMetrics::AdvanceMetric<Data>::MetricType
                 type);
 
 /** Retrieve advance data for glyphs. Used by the PDF backend. It calls
     underlying platform dependent API getAdvance to acquire the data.
     @param num_glyphs    Total number of glyphs in the given font.
     @param glyphIDs      For per-glyph info, specify subset of the font by
                          giving glyph ids.  Each integer represents a glyph
                          id.  Passing NULL means all glyphs in the font.
     @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if
                          glyphIDs is NULL.
 */
 template <typename Data, typename FontHandle>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
         FontHandle fontHandle,
         int num_glyphs,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount,
         bool (*getAdvance)(FontHandle fontHandle, int gId, Data* data));
 
 } // namespace skia_advanced_typeface_metrics_utils
 
 #endif