Rename GrOpList::reset to endFlush

Bug: skia:7111
Change-Id: I9e48224c7edcc51bd0368cb7c115acbc3bf8da16
Reviewed-on: https://skia-review.googlesource.com/54500
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp
index 59e1cd0f23..902ab89b7c 100644
--- a/src/gpu/GrOpList.cpp
+++ b/src/gpu/GrOpList.cpp
@@ -45,14 +45,17 @@ GrOpList::GrOpList(GrResourceProvider* resourceProvider,
 }
 
 GrOpList::~GrOpList() {
-    this->reset();
+    if (fTarget.get() && this == fTarget.get()->getLastOpList()) {
+        // Ensure the target proxy doesn't keep hold of a dangling back pointer.
+        fTarget.get()->setLastOpList(nullptr);
+    }
 }
 
 bool GrOpList::instantiate(GrResourceProvider* resourceProvider) {
     return SkToBool(fTarget.get()->instantiate(resourceProvider));
 }
 
-void GrOpList::reset() {
+void GrOpList::endFlush() {
     if (fTarget.get() && this == fTarget.get()->getLastOpList()) {
         fTarget.get()->setLastOpList(nullptr);
     }