Make skpaint->grpaint flow work for composing draws

gm/constcolorprocessor.cpp

Index: gm/constcolorprocessor.cpp
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index 40eb1a06c8ad2b021b5bb9ee6e96a5f69211bd41..539119e040347b6b6e9c15d639c5e1a15205cf88 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -15,7 +15,7 @@
 #include "GrContext.h"
 #include "GrTest.h"
 #include "effects/GrConstColorProcessor.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #include "SkGradientShader.h"
 
 namespace skiagm {
@@ -104,7 +104,7 @@ protected:
                     } else {
                         skPaint.setColor(kPaintColors[paintType]);
                     }
-                    SkAssertResult(SkPaint2GrPaint(context, skPaint, viewMatrix, false, &grPaint));
+                    SkAssertResult(SkPaintToGrPaint(context, skPaint, viewMatrix, &grPaint));
 
                     GrConstColorProcessor::InputMode mode = (GrConstColorProcessor::InputMode) m;
                     GrColor color = kColors[procColor];