commit 88e8bb2fe2d5bde9606f586b56f7a33599059298
author Robert Phillips <robertphillips@google.com> Tue Nov 10 12:01:52 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 10 18:31:59 2020 +0000
tree aa7f3dbb02541c34e4022e91c4ee0c0cb7ec5ccc
parent 40022ad5c9c6cee02cae9cd3ec389e8da2fd5999

Fix UMR (valgrind) bug in GrDrawingManager

Even prior to https://skia-review.googlesource.com/c/skia/+/332600
(Change UnrefDDLTask to just be the DDLTask) there was no good reason
the 'fRenderTask' array and the 'idArray' kept a strict 1-1
correspondence.

Change-Id: Ib92b47b724c319f52fff459d3dc28c49c17bd045
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333576
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index a4c1197..bc980e7 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -45,7 +45,7 @@
 #include "src/image/SkSurface_Gpu.h"
 
 void GrDrawingManager::RenderTaskDAG::gatherIDs(SkSTArray<8, uint32_t, true>* idArray) const {
-    idArray->reset(fRenderTasks.count());
+    idArray->reserve_back(fRenderTasks.count());
     for (int i = 0; i < fRenderTasks.count(); ++i) {
         if (fRenderTasks[i]) {
             fRenderTasks[i]->gatherIDs(idArray);
@@ -933,4 +933,3 @@
         resourceCache->purgeAsNeeded();
     }
 }
-