Index: include/private/GrAuditTrail.h |
diff --git a/include/private/GrAuditTrail.h b/include/private/GrAuditTrail.h |
index 3bb7bea43503fc968f153ea7911e57bd871045bf..b39f13f3627f509ef47b83cf0e7a0c6e13af38b9 100644 |
--- a/include/private/GrAuditTrail.h |
+++ b/include/private/GrAuditTrail.h |
@@ -134,7 +134,7 @@ private: |
int fBatchListID; |
int fChildID; |
}; |
- typedef SkTArray<SkAutoTDelete<Batch>, true> BatchPool; |
+ typedef SkTArray<std::unique_ptr<Batch>, true> BatchPool; |
typedef SkTArray<Batch*> Batches; |
@@ -144,14 +144,14 @@ private: |
Batches fChildren; |
uint32_t fRenderTargetUniqueID; |
}; |
- typedef SkTArray<SkAutoTDelete<BatchNode>, true> BatchList; |
+ typedef SkTArray<std::unique_ptr<BatchNode>, true> BatchList; |
void copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID); |
template <typename T> |
static void JsonifyTArray(SkString* json, const char* name, const T& array, |
bool addComma); |
- |
+ |
BatchPool fBatchPool; |
SkTHashMap<uint32_t, int> fIDLookup; |
SkTHashMap<int, Batches*> fClientIDLookup; |