Make skpaint->grpaint flow work for composing draws

src/gpu/GrTextContext.cpp

Index: src/gpu/GrTextContext.cpp
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 32c056f003106d49f6d9770a682991b0c128e3c1..1041b880f1daeee58dab1ff2e8a0ee79a305677b 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -16,6 +16,7 @@
 #include "SkDrawProcs.h"
 #include "SkGlyphCache.h"
 #include "SkGpuDevice.h"
+#include "SkGrPriv.h"
 #include "SkTextBlob.h"
 #include "SkTextMapStateProc.h"
 #include "SkTextToPathIter.h"
@@ -130,7 +131,7 @@ void GrTextContext::drawTextBlob(GrDrawContext* dc, GrRenderTarget* rt,
         runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
 
         GrPaint grPaint;
-        if (!SkPaint2GrPaint(fContext, runPaint, viewMatrix, true, &grPaint)) {
+        if (!SkPaintToGrPaint(fContext, runPaint, viewMatrix, &grPaint)) {
             return;
         }