Make skpaint->grpaint flow work for composing draws

src/gpu/GrTextContext.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextContext.h"
 #include "GrBlurUtils.h"
 #include "GrContext.h"
 #include "GrDrawContext.h"
 #include "GrFontScaler.h"
 
 #include "SkAutoKern.h"
 #include "SkDrawFilter.h"
 #include "SkDrawProcs.h"
 #include "SkGlyphCache.h"
 #include "SkGpuDevice.h"
+#include "SkGrPriv.h"
 #include "SkTextBlob.h"
 #include "SkTextMapStateProc.h"
 #include "SkTextToPathIter.h"
 
 GrTextContext::GrTextContext(GrContext* context, const SkSurfaceProps& surfaceProps)
     : fFallbackTextContext(nullptr)
     , fContext(context)
     , fSurfaceProps(surfaceProps) {
 }
 
@@ skipping 94 matching lines @@
 
         if (drawFilter && !drawFilter->filter(&runPaint, SkDrawFilter::kText_Type)) {
             // A false return from filter() means we should abort the current draw.
             runPaint = skPaint;
             continue;
         }
 
         runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
 
         GrPaint grPaint;
-        if (!SkPaint2GrPaint(fContext, runPaint, viewMatrix, true, &grPaint)) {
+        if (!SkPaintToGrPaint(fContext, runPaint, viewMatrix, &grPaint)) {
             return;
         }
 
         switch (it.positioning()) {
         case SkTextBlob::kDefault_Positioning:
             this->drawText(dc, rt, clip, grPaint, runPaint, viewMatrix, (const char *)it.glyphs(),
                            textLen, x + offset.x(), y + offset.y(), clipBounds);
             break;
         case SkTextBlob::kHorizontal_Positioning:
             this->drawPosText(dc, rt, clip, grPaint, runPaint, viewMatrix, (const char*)it.glyphs(),
@@ skipping 125 matching lines @@
     if (cache->getAuxProcData(GlyphCacheAuxProc, &auxData)) {
         scaler = (GrFontScaler*)auxData;
     }
     if (nullptr == scaler) {
         scaler = new GrFontScaler(cache);
         cache->setAuxProc(GlyphCacheAuxProc, scaler);
     }
 
     return scaler;
 }