Change DebugCanvas API to not encourage memory leaks

src/utils/debugger/SkDebugCanvas.cpp

 
 /*
  * Copyright 2012 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"
@@ skipping 370 matching lines @@
 }
 
 const SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() const {
     return fCommandVector;
 }
 
 SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() {
     return fCommandVector;
 }
 
-// TODO(chudy): Free command string memory.
-SkTArray<SkString>* SkDebugCanvas::getDrawCommandsAsStrings() const {
-    SkTArray<SkString>* commandString = new SkTArray<SkString>(fCommandVector.count());
+void SkDebugCanvas::getDrawCommandsAsStrings(SkTArray<SkString>* outCommands) const {
+    outCommands->resize_back(fCommandVector.count());
     if (!fCommandVector.isEmpty()) {
         for (int i = 0; i < fCommandVector.count(); i ++) {
-            commandString->push_back() = fCommandVector[i]->toString();
+            (*outCommands)[i] = fCommandVector[i]->toString();
         }
     }

[robertphillips, 2014/12/22 15:25:36]

else {
    outCommands->reset();
}

??

[Kimmo Kinnunen, 2014/12/29 07:23:13]

it tried to do that with resize_back(count), in case when count would be 0.

I posted another patch, would that be clearer?

-    return commandString;
 }
 
-SkTDArray<size_t>* SkDebugCanvas::getDrawCommandOffsets() const {
-    SkTDArray<size_t>* commandOffsets = new SkTDArray<size_t>;
+void SkDebugCanvas::getDrawCommandOffsets(SkTDArray<size_t>* outCommandOffsets) const {
     if (!fCommandVector.isEmpty()) {
+        outCommandOffsets->setCount(fCommandVector.count());
         for (int i = 0; i < fCommandVector.count(); i ++) {
-            *commandOffsets->push() = fCommandVector[i]->offset();
+            (*outCommandOffsets)[i] = fCommandVector[i]->offset();
         }
+    } else {
+        outCommandOffsets->reset();
     }
-    return commandOffsets;
 }
 
 void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level) {
     if (NULL == fTexOverrideFilter) {
         fTexOverrideFilter = new SkTexOverrideFilter;
     }
 
     fOverrideTexFiltering = overrideTexFiltering;
     fTexOverrideFilter->setFilterLevel(level);
 }
@@ skipping 287 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }