Limit lifetime of GrDrawContext objects

src/gpu/GrContext.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 "GrContext.h"
 
@@ skipping 107 matching lines @@
     }
 
     const SkSurfaceProps props(SkSurfacePropsCopyOrDefault(surfaceProps));
 
     SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
     if (!fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts()]) {
         fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts()] =
                 new GrDrawContext(fContext, fDrawTarget, props);
     }
 
-    return fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts()]; 
+    // For now, everyone gets a faux creation ref
+    return SkRef(fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts()]); 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 
 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
     GrContextOptions defaultOptions;
     return Create(backend, backendContext, defaultOptions);
 }
 
@@ skipping 277 matching lines @@
                 buffer = tmpPixels.get();
                 applyPremulToSrc = false;
             }
             if (!fGpu->writePixels(tempTexture, 0, 0, width, height,
                                    tempDrawInfo.fTempSurfaceDesc.fConfig, buffer,
                                    rowBytes)) {
                 return false;
             }
             SkMatrix matrix;
             matrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top));
-            GrDrawContext* drawContext = this->drawContext();
+            SkAutoTUnref<GrDrawContext> drawContext(this->drawContext());
             if (!drawContext) {
                 return false;
             }
             paint.addColorFragmentProcessor(fp);
             SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height));
             drawContext->drawRect(renderTarget, GrClip::WideOpen(), paint, matrix, rect, nullptr);
 
             if (kFlushWrites_PixelOp & pixelOpsFlags) {
                 this->flushSurfaceWrites(surface);
             }
@@ skipping 90 matching lines @@
                 }
             }
             if (!fp && temp) {
                 fp.reset(GrConfigConversionEffect::Create(
                     paint.getProcessorDataManager(), src->asTexture(), tempDrawInfo.fSwapRAndB,
                     GrConfigConversionEffect::kNone_PMConversion, textureMatrix));
             }
             if (fp) {
                 paint.addColorFragmentProcessor(fp);
                 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height));
-                GrDrawContext* drawContext = this->drawContext();
+                SkAutoTUnref<GrDrawContext> drawContext(this->drawContext());
                 drawContext->drawRect(temp->asRenderTarget(), GrClip::WideOpen(), paint,
                                       SkMatrix::I(), rect, nullptr);
                 surfaceToRead.reset(SkRef(temp.get()));
                 left = 0;
                 top = 0;
                 didTempDraw = true;
             }
         }
     }
 
@@ skipping 55 matching lines @@
     }
     ASSERT_OWNED_RESOURCE(src);
     ASSERT_OWNED_RESOURCE(dst);
 
     // Since we're going to the draw target and not GPU, no need to check kNoFlush
     // here.
     if (!dst->asRenderTarget()) {
         return;
     }
 
-    GrDrawContext* drawContext = this->drawContext();
+    SkAutoTUnref<GrDrawContext> drawContext(this->drawContext());
     if (!drawContext) {
         return;
     }
 
     drawContext->copySurface(dst->asRenderTarget(), src, srcRect, dstPoint);
 
     if (kFlushWrites_PixelOp & pixelOpsFlags) {
         this->flush();
     }
 }
@@ skipping 130 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->addGpuTraceMarker(marker);
 }
 
 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->removeGpuTraceMarker(marker);
 }