commit 46a1338968689284d687c4b999e62b369ec608c3
author Robert Phillips <robertphillips@google.com> Thu Aug 23 13:53:01 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 23 18:47:58 2018 +0000
tree cd8e50f81a2dc5a1fff100072884b9c63c556a84
parent a522d66eff20c5f0b920063ced69d07d36b1b36b

Switch GrTextTarget from drawPath to drawShape

Change-Id: I96b424c1c9369be4183eeb38729d49fff2ba87f4
Reviewed-on: https://skia-review.googlesource.com/148902
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index bba3328..7a1b3f7 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -9,6 +9,7 @@
 #include "GrBlurUtils.h"
 #include "GrClip.h"
 #include "GrContext.h"
+#include "GrShape.h"
 #include "GrStyle.h"
 #include "GrTextTarget.h"
 #include "SkColorFilter.h"
@@ -303,7 +304,6 @@
                 pathMatrix.postTranslate(pathGlyph.fX + transX, pathGlyph.fY + transY);
 
                 const SkPath* path = &pathGlyph.fPath;
-                bool pathIsMutable = false;
                 SkTLazy<SkPath> tmpPath;
 
                 GrStyle style(runPaint);
@@ -317,10 +317,12 @@
                     path->transform(pathMatrix, result);
                     result->setIsVolatile(true);
                     path = result;
-                    pathIsMutable = true;
                 }
 
-                target->drawPath(clip, *path, runPaint, *ctm, pathIsMutable);
+                // TODO: we are losing the mutability of the path here
+                GrShape shape(*path, paint);
+
+                target->drawShape(clip, runPaint, *ctm, shape);
             }
         }