Fix leak of GrGLTexID when its owning GrGLTexture has been abandoned.

src/gpu/gl/GrGLTexture.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLTexture_DEFINED
 #define GrGLTexture_DEFINED
@@ skipping 52 matching lines @@
 
     // creates a texture that is also an RT
     GrGLTexture(GrGpuGL* gpu,
                 const Desc& textureDesc,
                 const GrGLRenderTarget::Desc& rtDesc);
 
     // creates a non-RT texture
     GrGLTexture(GrGpuGL* gpu,
                 const Desc& textureDesc);
 
-
     virtual ~GrGLTexture() { this->release(); }
 
     virtual GrBackendObject getTextureHandle() const SK_OVERRIDE;
 
     virtual void invalidateCachedState() SK_OVERRIDE { fTexParams.invalidate(); }
 
-    // these functions
+    // These functions are used to track the texture parameters associated with the texture.
     const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const {
         *timestamp = fTexParamsTimestamp;
         return fTexParams;
     }
+
     void setCachedTexParams(const TexParams& texParams,
                             GrGpu::ResetTimestamp timestamp) {
         fTexParams = texParams;
         fTexParamsTimestamp = timestamp;
     }
-    GrGLuint textureID() const { return fTexIDObj->id(); }
+
+    GrGLuint textureID() const { return (NULL != fTexIDObj.get()) ? fTexIDObj->id() : 0; }
 
 protected:
-
     // overrides of GrTexture
     virtual void onAbandon() SK_OVERRIDE;
     virtual void onRelease() SK_OVERRIDE;
 
 private:
     TexParams                       fTexParams;
     GrGpu::ResetTimestamp           fTexParamsTimestamp;
-    GrGLTexID*                      fTexIDObj;
+    SkAutoTUnref<GrGLTexID>         fTexIDObj;
 
     void init(GrGpuGL* gpu,
               const Desc& textureDesc,
               const GrGLRenderTarget::Desc* rtDesc);
 
     typedef GrTexture INHERITED;
 };
 
 #endif