Revert of Remove GP from drawstate, revision of invariant output for GP

src/gpu/GrInOrderDrawBuffer.h

Index: src/gpu/GrInOrderDrawBuffer.h
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 9b850a78495944e7fcedd265f19b404390ff32e3..6771fccd66f6541649c4abcd9452cd7a238eed48 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -171,12 +171,11 @@
     };
 
     struct SetState : public Cmd {
-        SetState(const GrDrawState& drawState, const GrGeometryProcessor* gp,
-                 const GrPathProcessor* pp, const GrDrawTargetCaps& caps,
-                 const ScissorState& scissor, const GrDeviceCoordTexture* dstCopy,
-                 GrGpu::DrawType drawType)
+        SetState(const GrDrawState& drawState, GrColor color, uint8_t coverage,
+                 const GrDrawTargetCaps& caps, const ScissorState& scissor,
+                 const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType drawType)
         : Cmd(kSetState_Cmd)
-        , fState(drawState, gp, pp, caps, scissor, dstCopy, drawType) {}
+        , fState(drawState, color, coverage, caps, scissor, dstCopy, drawType) {}
 
         void execute(GrInOrderDrawBuffer*, const GrOptDrawState*) SK_OVERRIDE;
 
@@ -191,7 +190,6 @@
 
     // overrides from GrDrawTarget
     void onDraw(const GrDrawState&,
-                const GrGeometryProcessor*,
                 const DrawInfo&,
                 const ScissorState&,
                 const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
@@ -202,18 +200,17 @@
                     const SkMatrix* localMatrix) SK_OVERRIDE;
 
     void onStencilPath(const GrDrawState&,
-                       const GrPathProcessor*,
                        const GrPath*,
                        const ScissorState&,
                        const GrStencilSettings&) SK_OVERRIDE;
     void onDrawPath(const GrDrawState&,
-                    const GrPathProcessor*,
+                    GrColor,
                     const GrPath*,
                     const ScissorState&,
                     const GrStencilSettings&,
                     const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
     void onDrawPaths(const GrDrawState&,
-                     const GrPathProcessor*,
+                     GrColor,
                      const GrPathRange*,
                      const void* indices,
                      PathIndexType,
@@ -240,8 +237,8 @@
     // records it. If the draw can be skipped false is returned and no new GrOptDrawState is
     // recorded.
     bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(const GrDrawState&,
-                                                        const GrGeometryProcessor*,
-                                                        const GrPathProcessor*,
+                                                        GrColor,
+                                                        uint8_t coverage,
                                                         GrGpu::DrawType,
                                                         const GrClipMaskManager::ScissorState&,
                                                         const GrDeviceCoordTexture*);