commit bcaefb06221fdac89dfe06b3536bfc5b7cd4c067
author bsalomon <bsalomon@google.com> Mon Nov 03 11:07:12 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 03 11:07:12 2014 -0800
tree 14cf8e12251ebd96be847431049598cf05970e43
parent 882ee19a26fac2f10e0d28556a38b993211bfb5a

Remove GrGLTexID

BUG=skia:2889

Review URL: https://codereview.chromium.org/695133003

src/gpu/gl/GrGLTexture.cpp

diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index d9db6ea..8777d1b 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -29,22 +29,21 @@
     SkASSERT(0 != idDesc.fTextureID);
     fTexParams.invalidate();
     fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
-    fTexIDObj.reset(SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(),
-                                           idDesc.fTextureID,
-                                           idDesc.fIsWrapped)));
+    fTextureID = idDesc.fTextureID;
 }
 
 void GrGLTexture::onRelease() {
-    fTexIDObj.reset(NULL);
+    if (fTextureID) {
+        if (!this->isWrapped()) {
+            GL_CALL(DeleteTextures(1, &fTextureID));
+        }
+        fTextureID = 0;
+    }
     INHERITED::onRelease();
 }
 
 void GrGLTexture::onAbandon() {
-    if (fTexIDObj.get()) {
-        fTexIDObj->abandon();
-        fTexIDObj.reset(NULL);
-    }
-
+    fTextureID = 0;
     INHERITED::onAbandon();
 }