commit 1daa239f647c2c9c83141b91da6689eb003ee9e9
author Robert Phillips <robertphillips@google.com> Tue Feb 18 14:34:36 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 18 20:16:17 2020 +0000
tree b0d31ec0a5d955df9428c728120733e253632979
parent b01e12b716f77f6477618f2e9924719b9591cd5d

Make GrGLGpu's program cache be held as a unique_ptr

This seems a little bit less fussy.

Change-Id: If62fca188c83f1317351e1f18342a26e54355c07
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271597
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/gl/GrGLGpu.cpp

diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index b5fb511..ee69933 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -452,7 +452,6 @@
         }
     }
 
-    delete fProgramCache;
     fSamplerObjectCache.reset();
 }
 
@@ -495,8 +494,7 @@
     }
 
     fHWProgram.reset();
-    delete fProgramCache;
-    fProgramCache = nullptr;
+    fProgramCache.reset();
 
     fHWProgramID = 0;
     fTempSrcFBOID = 0;

src/gpu/gl/GrGLGpu.h

diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 6cd64bd..f359c5f 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -422,7 +422,7 @@
     std::unique_ptr<GrGLContext> fGLContext;
 
     // GL program-related state
-    ProgramCache*               fProgramCache;
+    std::unique_ptr<ProgramCache> fProgramCache;
 
     ///////////////////////////////////////////////////////////////////////////
     ///@name Caching of GL State