Fix memory leaks.

http://codereview.appspot.com/6301098/

git-svn-id: http://skia.googlecode.com/svn/trunk@4281 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h
index f8ad1c0..1f81afa 100644 (file)
--- a/include/gpu/GrSamplerState.h
+++ b/include/gpu/GrSamplerState.h
@@ -81,8 +81,7 @@ public:
         fSwapRAndB = s.fSwapRAndB;
         fTextureDomain = s.fTextureDomain;
 
-        fCustomStage = s.fCustomStage;
-        SkSafeRef(fCustomStage);
+        GrSafeAssign(fCustomStage, s.fCustomStage);
 
         return *this;
     }

diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
index 97f9b6d..f8d71ff 100644 (file)
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -86,7 +86,10 @@ void GrGpuGL::DeleteProgram(const GrGLInterface* gl,
     }
     GR_GL_CALL(gl, DeleteShader(programData->fFShaderID));
     GR_GL_CALL(gl, DeleteProgram(programData->fProgramID));
-    GR_DEBUGCODE(memset(programData, 0, sizeof(*programData));)
+    GR_DEBUGCODE(programData->fVShaderID = 0);
+    GR_DEBUGCODE(programData->fGShaderID = 0);
+    GR_DEBUGCODE(programData->fFShaderID = 0);
+    GR_DEBUGCODE(programData->fProgramID = 0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////