commit 2e3b3e369d79e78f7635d4c20e83a47ab571bdf2
author joshualitt <joshualitt@chromium.org> Tue Dec 09 13:31:14 2014 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 09 13:31:15 2014 -0800
tree 95378f3e35a21192f0db62e60bc6e408803050b7
parent f3c78ccf5694d22d2e4a7061a80399a7e69b59db

This cl moves color and coverage off of drawstate.  In an effort to keep this CL manageable, I have left the compute invariant input / output in a bit of a strange state(fixing this will be complicated).

In addition, NVPR makes this very complicated, and I haven't quite figured out a good way to handle it, so for now color and coverage DO live on optstate, but I will figure out some way to refactor that in future CLs.

BUG=skia:

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

src/gpu/GrBitmapTextContext.h

diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index 747facf..9aa5dbd 100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -31,7 +31,8 @@
     SkRect                            fVertexBounds;
     GrTexture*                        fCurrTexture;
     GrMaskFormat                      fCurrMaskFormat;
-    SkAutoTUnref<GrGeometryProcessor> fCachedGeometryProcessor;
+    SkAutoTUnref<const GrGeometryProcessor> fCachedGeometryProcessor;
+    SkAutoTUnref<const GrFragmentProcessor> fCachedTextureProcessor;
     // Used to check whether fCachedEffect is still valid.
     uint32_t                          fEffectTextureUniqueID;