commit 95ed55adc6b8f0cee063c2cf2e14782773b0087f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 24 14:46:47 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 24 14:46:47 2013 +0000
tree 0ff40233b89b318ba9eb573cc90dbf3e43c71da7
parent baa0220dfddda3cd44f0ffb5f95a4a60443eb8c3

Make all GrContext members that return a texture also ref the texture for the caller.
Review URL: https://codereview.appspot.com/7198049

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

src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 527cc9e..0fef7c6 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -295,9 +295,9 @@
             if (result.getTexture()) {
                 resultTex = (GrTexture*) result.getTexture();
             } else {
-                resultTex = GrLockCachedBitmapTexture(src->getContext(), result, NULL);
-                SkSafeRef(resultTex);
-                GrUnlockCachedBitmapTexture(resultTex);
+                resultTex = GrLockAndRefCachedBitmapTexture(src->getContext(), result, NULL);
+                SkSafeRef(resultTex); // for the caller
+                GrUnlockAndUnrefCachedBitmapTexture(resultTex);
                 return resultTex;
             }
         } else {