Replace SkTScopedPtr with SkAutoTDelete in Skia.

src/core/SkAdvancedTypefaceMetrics.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkAdvancedTypefaceMetrics.h"
@@ skipping 54 matching lines @@
 
 template <typename Data>
 void resetRange(SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* range,
                 int startId) {
     range->fStartId = startId;
     range->fAdvance.setCount(0);
 }
 
 template <typename Data>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
         int startId) {
     nextSlot->reset(new SkAdvancedTypefaceMetrics::AdvanceMetric<Data>);
     resetRange(nextSlot->get(), startId);
     return nextSlot->get();
 }
 
 template <typename Data>
 void zeroWildcardsInRange(
                           SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* range) {
     SkASSERT(false);
@@ skipping 55 matching lines @@
     //  a. Removing 4 0's or don't care's is a win
     // The cost of stopping and starting the range plus a run is 22
     // characters
     //  b. Removing 3 repeating advances is a win
     //  c. Removing 2 repeating advances and 3 don't cares is a win
     // When not currently in a range the cost of a run over a range is 16
     // characaters, so:
     //  d. Removing a leading 0/don't cares is a win because it is omitted
     //  e. Removing 2 repeating advances is a win
 
-    SkTScopedPtr<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;
+    SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;
     SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* curRange;
     SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = NULL;
     Data lastAdvance = kInvalidAdvance;
     int repeatedAdvances = 0;
     int wildCardsInRun = 0;
     int trailingWildCards = 0;
     uint32_t subsetIndex = 0;
 
     // Limit the loop count to glyph id ranges provided.
     int firstIndex = 0;
@@ skipping 76 matching lines @@
             trailingWildCards = 0;
         }
         curRange->fAdvance.append(1, &advance);
         if (advance != kDontCareAdvance) {
             lastAdvance = advance;
         }
     }
     if (curRange->fStartId == lastIndex) {
         SkASSERT(prevRange);
         SkASSERT(prevRange->fNext->fStartId == lastIndex);
-        prevRange->fNext.reset();
+        prevRange->fNext.free();
     } else {
         finishRange(curRange, lastIndex - 1,
                     SkAdvancedTypefaceMetrics::WidthRange::kRange);
     }
-    return result.release();
+    return result.detach();
 }
 
 // Make AdvanceMetric template functions available for linking with typename
 // WidthRange and VerticalAdvanceRange.
 #if defined(SK_BUILD_FOR_WIN)
 template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
         HDC hdc,
         int num_glyphs,
         const uint32_t* subsetGlyphIDs,
         uint32_t subsetGlyphIDsLength,
@@ skipping 16 matching lines @@
         CTFontRef ctFont,
         int num_glyphs,
         const uint32_t* subsetGlyphIDs,
         uint32_t subsetGlyphIDsLength,
         bool (*getAdvance)(CTFontRef ctFont, int gId, int16_t* data));
 #endif
 template void resetRange(
         SkAdvancedTypefaceMetrics::WidthRange* range,
         int startId);
 template SkAdvancedTypefaceMetrics::WidthRange* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::WidthRange >* nextSlot,
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::WidthRange >* nextSlot,
         int startId);
 template void finishRange<int16_t>(
         SkAdvancedTypefaceMetrics::WidthRange* range,
         int endId,
         SkAdvancedTypefaceMetrics::WidthRange::MetricType type);
 
 template void resetRange(
         SkAdvancedTypefaceMetrics::VerticalAdvanceRange* range,
         int startId);
 template SkAdvancedTypefaceMetrics::VerticalAdvanceRange* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::VerticalAdvanceRange >*
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::VerticalAdvanceRange >*
             nextSlot,
         int startId);
 template void finishRange<SkAdvancedTypefaceMetrics::VerticalMetric>(
         SkAdvancedTypefaceMetrics::VerticalAdvanceRange* range,
         int endId,
         SkAdvancedTypefaceMetrics::VerticalAdvanceRange::MetricType type);
 
 // additional declaration needed for testing with a face of an unknown type
 template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
         void* fontData,
         int num_glyphs,
         const uint32_t* subsetGlyphIDs,
         uint32_t subsetGlyphIDsLength,
         bool (*getAdvance)(void* fontData, int gId, int16_t* data));
 
 } // namespace skia_advanced_typeface_metrics_utils