Make skpaint->grpaint flow work for composing draws

gm/constcolorprocessor.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
 #include "gm.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
 #include "GrTest.h"
 #include "effects/GrConstColorProcessor.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #include "SkGradientShader.h"
 
 namespace skiagm {
 /**
  * This GM directly exercises GrConstColorProcessor.
  */
 class ConstColorProcessor : public GM {
 public:
     ConstColorProcessor() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
@@ skipping 68 matching lines @@
                         return;
                     }
 
                     GrPaint grPaint;
                     SkPaint skPaint;
                     if (paintType >= SK_ARRAY_COUNT(kPaintColors)) {
                         skPaint.setShader(fShader);
                     } 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];
                     SkAutoTUnref<GrFragmentProcessor> fp(GrConstColorProcessor::Create(color, mode));
 
                     GrClip clip;
                     GrPipelineBuilder pipelineBuilder(grPaint, rt, clip);
                     pipelineBuilder.addColorFragmentProcessor(fp);
 
                     tt.target()->drawNonAARect(pipelineBuilder,
@@ skipping 70 matching lines @@
     typedef GM INHERITED;
 };
 
 const SkScalar ConstColorProcessor::kPad = 10.f;
 const SkScalar ConstColorProcessor::kRectSize = 20.f;
 
 DEF_GM(return new ConstColorProcessor;)
 }
 
 #endif