commit 4150eea6c49ecec882a8d3e1c61d6a25fcd1e905
author Robert Phillips <robertphillips@google.com> Wed Feb 07 17:08:21 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 08 12:36:29 2018 +0000
tree 21b7089d6745f769be88f8f3d9a127d521ff48be
parent 1f1bb9c0b8d5f50ac74716e6961a6c92f1d373d8

Move control of explicit GPU resource allocation to GrContextOptions

Change-Id: Ic284acc79bab5936f0007d5ae5fb1e7a9929e2af
Reviewed-on: https://skia-review.googlesource.com/104880
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

bench/TopoSortBench.cpp

diff --git a/bench/TopoSortBench.cpp b/bench/TopoSortBench.cpp
index 8a8ec66..123ff74 100644
--- a/bench/TopoSortBench.cpp
+++ b/bench/TopoSortBench.cpp
@@ -17,7 +17,6 @@
     TopoSortBench() { }
 
     ~TopoSortBench() override {
-        sk_tool_utils::TopoTestNode::DeallocNodes(&fGraph);
     }
 
     bool isSuitableFor(Backend backend) override {
@@ -39,7 +38,7 @@
             for (int j = 0; j < numEdges; ++j) {
                 int dep = fRand.nextU() % i;
 
-                fGraph[i]->dependsOn(fGraph[dep]);
+                fGraph[i]->dependsOn(fGraph[dep].get());
             }
         }
     }
@@ -67,7 +66,7 @@
     static const int kNumElements = 1000;
     static const int kMaxEdges = 5;
 
-    SkTDArray<sk_tool_utils::TopoTestNode*> fGraph;
+    SkTArray<sk_sp<sk_tool_utils::TopoTestNode>> fGraph;
     SkRandom fRand;
 
     typedef Benchmark INHERITED;