Limit lifetime of GrDrawContext objects

src/gpu/GrRenderTarget.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrRenderTarget.h"
 
 #include "GrContext.h"
 #include "GrDrawContext.h"
 #include "GrGpu.h"
 #include "GrRenderTargetPriv.h"
 #include "GrStencilAttachment.h"
 
 void GrRenderTarget::discard() {
     // go through context so that all necessary flushing occurs
     GrContext* context = this->getContext();
-    GrDrawContext* drawContext = context ? context->drawContext() : nullptr;
+    if (!context) {
+        return;
+    }
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext());
     if (!drawContext) {

[jvanverth1, 2015/09/01 14:43:37]

Is this check still needed?

[robertphillips, 2015/09/01 14:49:04]

Yep - the context could still be abandoned at this point (which would return a
NULL draw context).

         return;
     }
 
     drawContext->discard(this);
 }
 
 void GrRenderTarget::flagAsNeedingResolve(const SkIRect* rect) {
     if (kCanResolve_ResolveType == getResolveType()) {
         if (rect) {
             fResolveRect.join(*rect);
@@ skipping 37 matching lines @@
 
 GrStencilAttachment* GrRenderTargetPriv::attachStencilAttachment() const {
     if (fRenderTarget->fStencilAttachment) {
         return fRenderTarget->fStencilAttachment;
     }
     if (!fRenderTarget->wasDestroyed() && fRenderTarget->canAttemptStencilAttachment()) {
         fRenderTarget->getGpu()->attachStencilAttachmentToRenderTarget(fRenderTarget);
     }
     return fRenderTarget->fStencilAttachment;
 }