Extract most of the mutable state of SkShader into a separate Context object.

src/core/SkBitmapProcState.cpp

Index: src/core/SkBitmapProcState.cpp
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index cdc582bfeec64a70791d0ecb615186b98296e639..069cea8781e130fd5f2f65e665626254cfe28768 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -398,6 +398,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
     }
     // The above logic should have always assigned fBitmap, but in case it
     // didn't, we check for that now...
+    // TODO(dominikg): Can we just use an SkASSERT(fBitmap)?

[scroggo, 2014/03/24 21:24:46]

I think humper@ is the right person to ask that question.

Did you try running it with the assert?

[Dominik Grewe, 2014/03/27 14:27:20]

Works fine on the tests.

     if (NULL == fBitmap) {
         return false;
     }
@@ -480,6 +481,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
     // shader will perform.
 
     fMatrixProc = this->chooseMatrixProc(trivialMatrix);
+    // TODO(dominikg): SkASSERT(fMatrixProc) instead? chooseMatrixProc never returns NULL.

[scroggo, 2014/03/24 21:24:46]

If chooseMatrixProc never returns NULL, then I think it's okay to change to
SkASSERT (though perhaps it should be a separate change?).

[Dominik Grewe, 2014/03/26 17:22:22]

I was trying to reduce the cases where this function could fail so that we can
create a short validation method, but maybe we won't need that in the end.

     if (NULL == fMatrixProc) {
         return false;
     }
@@ -521,6 +523,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
                 fPaintPMColor = SkPreMultiplyColor(paint.getColor());
                 break;
             default:
+                // TODO(dominikg): Should we ever get here? SkASSERT(false) instead?
                 return false;
         }