Reland of 8525 with fix for case when GrRT outlives GrTexture.

src/gpu/gl/GrGLTexture.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 "GrGLTexture.h"
 #include "GrGpuGL.h"
 
@@ skipping 16 matching lines @@
                                       textureDesc.fTextureID,
                                       textureDesc.fIsWrapped));
 
     if (NULL != rtDesc) {
         GrGLIRect vp;
         vp.fLeft   = 0;
         vp.fWidth  = textureDesc.fWidth;
         vp.fBottom = 0;
         vp.fHeight = textureDesc.fHeight;
 
-        fRenderTarget = SkNEW_ARGS(GrGLRenderTarget,
-                                   (gpu, *rtDesc, vp, fTexIDObj, this));
+        fRenderTarget.reset(SkNEW_ARGS(GrGLRenderTarget, (gpu, *rtDesc, vp, fTexIDObj, this)));
     }
 }
 
 GrGLTexture::GrGLTexture(GrGpuGL* gpu,
                          const Desc& textureDesc)
     : INHERITED(gpu, textureDesc.fIsWrapped, textureDesc) {
     this->init(gpu, textureDesc, NULL);
 }
 
 GrGLTexture::GrGLTexture(GrGpuGL* gpu,
@@ skipping 17 matching lines @@
     if (NULL != fTexIDObj) {
         fTexIDObj->abandon();
     }
 
     INHERITED::onAbandon();
 }
 
 GrBackendObject GrGLTexture::getTextureHandle() const {
     return fTexIDObj->id();
 }