commit c434ade20eba4a62c450b7ce33a89966fac9df62
author Herb Derby <herb@google.com> Wed Jul 11 16:07:01 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 12 20:59:19 2018 +0000
tree 99430be42012ee0c664974bb9f4ba564392e80fc
parent 04aa393045c6172f78d96f9f5a02c6f1cc0da445

Move to using pointers in simplifyDraw*

Move to using pointers into buffers. This will allow
multiple runs from blobs to share buffers.

Change-Id: I6ebed2e490c5fe71077ddc921ead145ce17c5ebd
Reviewed-on: https://skia-review.googlesource.com/141049
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/gpu/text/GrTextContext.cpp

diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 28204eb..04d92ae 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -211,8 +211,8 @@
                 case SkTextBlob::kDefault_Positioning: {
                     auto origin = SkPoint::Make(x + offset.x(), y + offset.y());
                     SkGlyphRunBuilder builder;
-                    builder.prepareDrawText(runPaint.skPaint(),
-                                            (const char*)it.glyphs(), textLen, origin);
+                    builder.drawText(runPaint.skPaint(),
+                                     (const char*) it.glyphs(), textLen, origin);
 
                     auto glyphRun = builder.useGlyphRun();
 
@@ -246,8 +246,8 @@
                 case SkTextBlob::kDefault_Positioning: {
                     auto origin = SkPoint::Make(x + offset.x(), y + offset.y());
                     SkGlyphRunBuilder builder;
-                    builder.prepareDrawText(runPaint.skPaint(),
-                                            (const char*)it.glyphs(), textLen, origin);
+                    builder.drawText(runPaint.skPaint(),
+                                     (const char*) it.glyphs(), textLen, origin);
 
                     auto glyphRun = builder.useGlyphRun();
 
@@ -780,7 +780,7 @@
 
     auto origin = SkPoint::Make(x, y);
     SkGlyphRunBuilder builder;
-    builder.prepareDrawText(skPaint, text, textLen, origin);
+    builder.drawText(skPaint, text, textLen, origin);
     sk_sp<GrTextBlob> blob;
 
     auto glyphRun = builder.useGlyphRun();