commit e7591bb0c10ac6b9827738cb910474561039e2f4
author mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 15 03:28:22 2013 +0000
committer mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 15 03:28:22 2013 +0000
tree ce993969ea12723d9efb4228318e9595ee4ef97c
parent 9b64cac7c8db2dce6759f551d3bab4192563d8c0

call endContext() if we have to return false from setContext(), to keep the
debugging fInSetContext flag up-to-date.



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

src/core/SkBitmapProcShader.cpp

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 13c445e..c3b9b26 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -86,11 +86,13 @@
     fState.fOrigBitmap.lockPixels();
     if (!fState.fOrigBitmap.getTexture() && !fState.fOrigBitmap.readyToDraw()) {
         fState.fOrigBitmap.unlockPixels();
+        this->INHERITED::endContext();
         return false;
     }
 
     if (!fState.chooseProcs(this->getTotalInverse(), paint)) {
         fState.fOrigBitmap.unlockPixels();
+        this->INHERITED::endContext();
         return false;
     }