diff options
author | 2017-04-28 15:35:12 -0400 | |
---|---|---|
committer | 2017-04-28 20:41:04 +0000 | |
commit | 2a475eae622adc1e8fa29206be1eaf862c23548e (patch) | |
tree | 6bad5dbe2ef7aad1c7e657df6bd8cfe3a752c5fd /gm | |
parent | ec138b40ba940ab0d76b5550ee2c5505629c5293 (diff) |
add drawString helper to canvas
Many tests and examples use drawText with
a guess of how long the text is in bytes,
or a call to strlen(). Add a helper to
SkCanvas to simplify these examples.
Add another helper for SkString.
R=reed@google.com
Change-Id: I0204a31e938f065606f08ee7cd9a6b36db791ee2
Reviewed-on: https://skia-review.googlesource.com/13642
Commit-Queue: Cary Clark <caryclark@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'gm')
73 files changed, 249 insertions, 280 deletions
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index 96b9b4880b..eab68b4e81 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -107,10 +107,10 @@ protected: if (kShape_Pass == drawingPass) { fLabelPaint.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText("Src Unknown", sizeof("Src Unknown") - 1, + canvas->drawString("Src Unknown", kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2, kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint); - canvas->drawText("Src Opaque", sizeof("Src Opaque") - 1, + canvas->drawString("Src Opaque", kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2 + kPaintSpacing, kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint); @@ -180,10 +180,10 @@ protected: titlePaint.setTextSize(9 * titlePaint.getTextSize() / 8); titlePaint.setFakeBoldText(true); titlePaint.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText("Porter Duff", sizeof("Porter Duff") - 1, + canvas->drawString("Porter Duff", kLabelSpacing + 4 * kShapeTypeSpacing, kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint); - canvas->drawText("Advanced", sizeof("Advanced") - 1, + canvas->drawString("Advanced", kXfermodeTypeSpacing + kLabelSpacing + 4 * kShapeTypeSpacing, kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint); @@ -194,7 +194,7 @@ protected: void drawModeName(SkCanvas* canvas, SkBlendMode mode) { const char* modeName = SkBlendMode_Name(mode); fLabelPaint.setTextAlign(SkPaint::kRight_Align); - canvas->drawText(modeName, strlen(modeName), kLabelSpacing - kShapeSize / 4, + canvas->drawString(modeName, kLabelSpacing - kShapeSize / 4, fLabelPaint.getTextSize() / 4, fLabelPaint); } diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp index 98d6621c6b..4c8ea359f1 100644 --- a/gm/all_bitmap_configs.cpp +++ b/gm/all_bitmap_configs.cpp @@ -150,7 +150,7 @@ static void draw(SkCanvas* canvas, const char text[]) { SkASSERT(src.colorType() == colorType); canvas->drawBitmap(src, 0.0f, 0.0f); - canvas->drawText(text, strlen(text), 0.0f, 12.0f, p); + canvas->drawString(text, 0.0f, 12.0f, p); } DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) { diff --git a/gm/animatedGif.cpp b/gm/animatedGif.cpp index dd08abfd36..5f4fe71cb0 100644 --- a/gm/animatedGif.cpp +++ b/gm/animatedGif.cpp @@ -27,7 +27,7 @@ namespace { SkPaint paint; SkRect bounds; paint.measureText(errorText.c_str(), errorText.size(), &bounds); - canvas->drawText(errorText.c_str(), errorText.size(), kOffset, bounds.height() + kOffset, + canvas->drawString(errorText, kOffset, bounds.height() + kOffset, paint); } } diff --git a/gm/arithmode.cpp b/gm/arithmode.cpp index c01ece7990..54169ceef6 100644 --- a/gm/arithmode.cpp +++ b/gm/arithmode.cpp @@ -60,7 +60,7 @@ static void show_k_text(SkCanvas* canvas, SkScalar x, SkScalar y, const SkScalar SkString str; str.appendScalar(k[i]); SkScalar width = paint.measureText(str.c_str(), str.size()); - canvas->drawText(str.c_str(), str.size(), x, y + paint.getTextSize(), paint); + canvas->drawString(str, x, y + paint.getTextSize(), paint); x += width + SkIntToScalar(10); } } @@ -152,7 +152,7 @@ protected: paint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&paint); SkString str(enforcePMColor ? "enforcePM" : "no enforcePM"); - canvas->drawText(str.c_str(), str.size(), 0, paint.getTextSize(), paint); + canvas->drawString(str, 0, paint.getTextSize(), paint); } canvas->translate(0, HH + 12); } diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp index 4d5005e2da..6b3c9b11cb 100644 --- a/gm/bigtext.cpp +++ b/gm/bigtext.cpp @@ -43,7 +43,7 @@ protected: }; paint.setColor(SK_ColorRED); - canvas->drawText("/", 1, pos.fX, pos.fY, paint); + canvas->drawString("/", pos.fX, pos.fY, paint); paint.setColor(SK_ColorBLUE); canvas->drawPosText("\\", 1, &pos, paint); diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index 64f11368ad..ec9e423d12 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -101,7 +101,7 @@ protected: SkScalar textWidth = paint.measureText(name, strlen(name)); SkScalar x = (width - textWidth) / SkScalar(2); SkScalar y = paint.getFontSpacing() / SkScalar(2); - canvas->drawText(name, strlen(name), x, y, paint); + canvas->drawString(name, x, y, paint); // Draw destination bitmap canvas->translate(0, vertOffset); diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp index b99ab1059f..4d31cae421 100644 --- a/gm/bitmapfilters.cpp +++ b/gm/bitmapfilters.cpp @@ -52,7 +52,7 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) { paint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&paint); const char* name = sk_tool_utils::colortype_name(bm.colorType()); - canvas->drawText(name, strlen(name), x, SkIntToScalar(bm.height())*scale*5/8, + canvas->drawString(name, x, SkIntToScalar(bm.height())*scale*5/8, paint); canvas->translate(SkIntToScalar(48), 0); diff --git a/gm/blurs.cpp b/gm/blurs.cpp index f1f44e7232..a7b1a5f769 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -55,14 +55,14 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD SkScalar x = SkIntToScalar(70); SkScalar y = SkIntToScalar(400); paint.setColor(SK_ColorBLACK); - canvas->drawText("Hamburgefons Style", 18, x, y, paint); - canvas->drawText("Hamburgefons Style", 18, + canvas->drawString("Hamburgefons Style", x, y, paint); + canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint); paint.setMaskFilter(nullptr); paint.setColor(SK_ColorWHITE); x -= SkIntToScalar(2); y -= SkIntToScalar(2); - canvas->drawText("Hamburgefons Style", 18, x, y, paint); + canvas->drawString("Hamburgefons Style", x, y, paint); } canvas->restore(); flags = SkBlurMaskFilter::kHighQuality_BlurFlag; diff --git a/gm/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp index e7ea97db96..313fd9336b 100644 --- a/gm/bmpfilterqualityrepeat.cpp +++ b/gm/bmpfilterqualityrepeat.cpp @@ -76,7 +76,7 @@ private: bmpPaint.setShader(SkShader::MakeBitmapShader(fBmp, kTM, kTM, &lm)); bmpPaint.setFilterQuality(kQualities[q].fQuality); canvas->drawRect(rect, bmpPaint); - canvas->drawText(kQualities[q].fName, strlen(kQualities[q].fName), 20, 40, textPaint); + canvas->drawString(kQualities[q].fName, 20, 40, textPaint); canvas->translate(250, 0); } diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index f871e53d55..7626f9a071 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -88,7 +88,7 @@ protected: paint.setTextSize(textSize); paint.getFontMetrics(&metrics); y += -metrics.fAscent; - canvas->drawText(text, strlen(text), 10, y, paint); + canvas->drawString(text, 10, y, paint); y += metrics.fDescent + metrics.fLeading; } @@ -124,7 +124,7 @@ protected: shaderPaint.setTextSize(30); shaderPaint.getFontMetrics(&metrics); y += -metrics.fAscent; - canvas->drawText(text, strlen(text), 380, y, shaderPaint); + canvas->drawString(text, 380, y, shaderPaint); y += metrics.fDescent + metrics.fLeading; } } @@ -162,10 +162,10 @@ protected: canvas->save(); canvas->drawRect(clipRect, clipHairline); paint.setAlpha(0x20); - canvas->drawText(text, strlen(text), 0, 0, paint); + canvas->drawString(text, 0, 0, paint); canvas->clipRect(clipRect); paint.setAlpha(0xFF); - canvas->drawText(text, strlen(text), 0, 0, paint); + canvas->drawString(text, 0, 0, paint); canvas->restore(); canvas->translate(0, SkIntToScalar(25)); } diff --git a/gm/coloremoji_blendmodes.cpp b/gm/coloremoji_blendmodes.cpp index d7e8b6c81e..ee3db7671d 100644 --- a/gm/coloremoji_blendmodes.cpp +++ b/gm/coloremoji_blendmodes.cpp @@ -138,7 +138,7 @@ protected: } #if 1 const char* label = SkBlendMode_Name(gModes[i]); - canvas->drawText(label, strlen(label), x + w/2, y - labelP.getTextSize()/2, labelP); + canvas->drawString(label, x + w/2, y - labelP.getTextSize()/2, labelP); #endif x += w + SkIntToScalar(10); if ((i % W) == W - 1) { diff --git a/gm/colorwheel.cpp b/gm/colorwheel.cpp index a1ca021b16..b938cd5088 100644 --- a/gm/colorwheel.cpp +++ b/gm/colorwheel.cpp @@ -46,17 +46,17 @@ DEF_SIMPLE_GM(colorwheelnative, canvas, 128, 28) { canvas->clear(sk_tool_utils::color_to_565(SK_ColorLTGRAY)); paint.setColor(SK_ColorRED); - canvas->drawText("R", 1, 8.0f, 20.0f, paint); + canvas->drawString("R", 8.0f, 20.0f, paint); paint.setColor(SK_ColorGREEN); - canvas->drawText("G", 1, 24.0f, 20.0f, paint); + canvas->drawString("G", 24.0f, 20.0f, paint); paint.setColor(SK_ColorBLUE); - canvas->drawText("B", 1, 40.0f, 20.0f, paint); + canvas->drawString("B", 40.0f, 20.0f, paint); paint.setColor(SK_ColorCYAN); - canvas->drawText("C", 1, 56.0f, 20.0f, paint); + canvas->drawString("C", 56.0f, 20.0f, paint); paint.setColor(SK_ColorMAGENTA); - canvas->drawText("M", 1, 72.0f, 20.0f, paint); + canvas->drawString("M", 72.0f, 20.0f, paint); paint.setColor(SK_ColorYELLOW); - canvas->drawText("Y", 1, 88.0f, 20.0f, paint); + canvas->drawString("Y", 88.0f, 20.0f, paint); paint.setColor(SK_ColorBLACK); - canvas->drawText("K", 1, 104.0f, 20.0f, paint); + canvas->drawString("K", 104.0f, 20.0f, paint); } diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index 296871581d..ae9c4db31f 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -151,15 +151,14 @@ protected: SkScalar txtX = SkIntToScalar(45); paint.setColor(gClipAColor); const char* aTxt = doInvA ? "InvA " : "A "; - canvas->drawText(aTxt, strlen(aTxt), txtX, SkIntToScalar(220), paint); + canvas->drawString(aTxt, txtX, SkIntToScalar(220), paint); txtX += paint.measureText(aTxt, strlen(aTxt)); paint.setColor(SK_ColorBLACK); - canvas->drawText(gOps[op].fName, strlen(gOps[op].fName), - txtX, SkIntToScalar(220), paint); + canvas->drawString(gOps[op].fName, txtX, SkIntToScalar(220), paint); txtX += paint.measureText(gOps[op].fName, strlen(gOps[op].fName)); paint.setColor(gClipBColor); const char* bTxt = doInvB ? "InvB " : "B "; - canvas->drawText(bTxt, strlen(bTxt), txtX, SkIntToScalar(220), paint); + canvas->drawString(bTxt, txtX, SkIntToScalar(220), paint); canvas->translate(SkIntToScalar(250),0); } diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp index 47b80ab7ad..7c5c672128 100644 --- a/gm/complexclip3.cpp +++ b/gm/complexclip3.cpp @@ -103,8 +103,7 @@ protected: doAAB ? "A" : "B", doInvB ? "I" : "N"); - canvas->drawText(str.c_str(), strlen(str.c_str()), txtX, SkIntToScalar(130), - paint); + canvas->drawString(str.c_str(), txtX, SkIntToScalar(130), paint); if (doInvB) { canvas->translate(SkIntToScalar(150),0); } else { diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index a595a07d38..2e0fde2861 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -135,7 +135,7 @@ protected: // get the bounds of the text in order to position it labelPaint.measureText(inputLabel.c_str(), inputLabel.size(), &inputLabelBounds); - canvas->drawText(inputLabel.c_str(), inputLabel.size(), + canvas->drawString(inputLabel, renderRect.fRight + kPad, -inputLabelBounds.fTop, labelPaint); // update the bounds to reflect the offset we used to draw it. @@ -144,7 +144,7 @@ protected: SkRect procLabelBounds; labelPaint.measureText(procLabel.c_str(), procLabel.size(), &procLabelBounds); - canvas->drawText(procLabel.c_str(), procLabel.size(), + canvas->drawString(procLabel, renderRect.fRight + kPad, inputLabelBounds.fBottom + 2.f - procLabelBounds.fTop, labelPaint); diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index fd2156c1d7..6bbcd9012b 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -202,10 +202,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Cubic Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -244,18 +244,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } @@ -347,10 +344,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Cubic Closed Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -389,18 +386,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } diff --git a/gm/dashing.cpp b/gm/dashing.cpp index 13d45cb913..b527fbf987 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -543,7 +543,7 @@ DEF_SIMPLE_GM(dashtextcaps, canvas, 512, 512) { sk_tool_utils::set_portable_typeface(&p); const SkScalar intervals[] = { 12, 12 }; p.setPathEffect(SkDashPathEffect::Make(intervals, SK_ARRAY_COUNT(intervals), 0)); - canvas->drawText("Sausages", 8, 10, 90, p); + canvas->drawString("Sausages", 10, 90, p); canvas->drawLine(8, 120, 456, 120, p); } diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp index 25da045bc4..9de66ea9ea 100644 --- a/gm/degeneratesegments.cpp +++ b/gm/degeneratesegments.cpp @@ -294,10 +294,10 @@ protected: const char title[] = "Random Paths Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, " "with Stroke width 6"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(220*SK_Scalar1, 50*SK_Scalar1); @@ -351,38 +351,30 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(style.fName, - strlen(style.fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(fill.fName, - strlen(fill.fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(cap.fName, - strlen(cap.fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s1], - strlen(gSegmentNames[s1]), - 0, rect.height() + 48 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s2], - strlen(gSegmentNames[s2]), - 0, rect.height() + 60 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s3], - strlen(gSegmentNames[s3]), - 0, rect.height() + 72 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s4], - strlen(gSegmentNames[s4]), - 0, rect.height() + 84 * SK_Scalar1, - labelPaint); - canvas->drawText(gSegmentNames[s5], - strlen(gSegmentNames[s5]), - 0, rect.height() + 96 * SK_Scalar1, - labelPaint); + canvas->drawString(style.fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(fill.fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(cap.fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s1], + 0, rect.height() + 48 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s2], + 0, rect.height() + 60 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s3], + 0, rect.height() + 72 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s4], + 0, rect.height() + 84 * SK_Scalar1, + labelPaint); + canvas->drawString(gSegmentNames[s5], + 0, rect.height() + 96 * SK_Scalar1, + labelPaint); } canvas->restore(); } diff --git a/gm/dftext.cpp b/gm/dftext.cpp index fb69f9b4e1..6067327b81 100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -187,7 +187,7 @@ protected: if (fEmojiTypeface) { paint.setTypeface(fEmojiTypeface); paint.setTextSize(SkIntToScalar(19)); - canvas->drawText(fEmojiText, strlen(fEmojiText), 670, 90, paint); + canvas->drawString(fEmojiText, 670, 90, paint); } #if SK_SUPPORT_GPU // render offscreen buffer diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index ba1edc9835..fefc94bd57 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -127,13 +127,13 @@ class DownsampleBitmapTextGM: public DownsampleBitmapGM { paint.setTextSize(fTextSize); setTypeface(&paint, "serif", SkFontStyle()); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 1.2f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 2.4f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 3.6f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 4.8f*fTextSize, paint); } private: typedef DownsampleBitmapGM INHERITED; diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp index de64caba80..548641b354 100644 --- a/gm/drawatlascolor.cpp +++ b/gm/drawatlascolor.cpp @@ -138,7 +138,7 @@ protected: for (int i = 0; i < numModes; ++i) { const char* label = SkBlendMode_Name(gModes[i]); - canvas->drawText(label, strlen(label), + canvas->drawString(label, i*(target.width()+kPad)+kPad, SkIntToScalar(kTextPad), textP); } diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 0becf45183..2cd1b2f93e 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -180,7 +180,7 @@ protected: sk_tool_utils::set_portable_typeface(&blackPaint); SkString title; title.printf("Bitmap size: %d x %d", gBmpSize, gBmpSize); - canvas->drawText(title.c_str(), title.size(), 0, + canvas->drawString(title, 0, titleHeight, blackPaint); canvas->translate(0, SK_Scalar1 * kPadY / 2 + titleHeight); @@ -199,7 +199,7 @@ protected: blackPaint.setTextSize(SK_Scalar1 * 10); SkScalar baseline = dstRect.height() + blackPaint.getTextSize() + SK_Scalar1 * 3; - canvas->drawText(label.c_str(), label.size(), + canvas->drawString(label, 0, baseline, blackPaint); blackPaint.setStyle(SkPaint::kStroke_Style); diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp index c4052e3815..07ec8d8c3f 100644 --- a/gm/drawlooper.cpp +++ b/gm/drawlooper.cpp @@ -43,7 +43,7 @@ protected: canvas->drawCircle(50, 50, 30, paint); canvas->drawRect({ 150, 50, 200, 100 }, paint); - canvas->drawText("Looper", 6, 230, 100, paint); + canvas->drawString("Looper", 230, 100, paint); } private: diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp index 87cd798483..11de72785a 100644 --- a/gm/dropshadowimagefilter.cpp +++ b/gm/dropshadowimagefilter.cpp @@ -45,7 +45,7 @@ static void draw_text(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> im paint.setTextAlign(SkPaint::kCenter_Align); canvas->save(); canvas->clipRect(r); - canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint); + canvas->drawString("Text", r.centerX(), r.centerY(), paint); canvas->restore(); } diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp index f6086b195a..3385ae4a69 100644 --- a/gm/dstreadshuffle.cpp +++ b/gm/dstreadshuffle.cpp @@ -85,7 +85,7 @@ protected: paint->setTextSize(100.f); paint->setFakeBoldText(true); sk_tool_utils::set_portable_typeface(paint); - canvas->drawText(text, strlen(text), 0.f, 100.f, *paint); + canvas->drawString(text, 0.f, 100.f, *paint); } default: break; diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp index 56377e7338..67da93f365 100644 --- a/gm/emptypath.cpp +++ b/gm/emptypath.cpp @@ -68,10 +68,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Empty Paths Drawn Into Rectangle Clips With " "Indicated Style and Fill"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -109,14 +109,12 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(12 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 15 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 28 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 15 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 28 * SK_Scalar1, + labelPaint); } } canvas->restore(); diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 0f3371cb90..92aeddc788 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -125,13 +125,13 @@ class FilterBitmapTextGM: public FilterBitmapGM { paint.setTextSize(fTextSize); setTypeface(&paint, "serif", SkFontStyle()); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 1.2f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 2.4f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 3.6f*fTextSize, paint); setTypeface(&paint, "serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic)); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint); + canvas.drawString("Hamburgefons", fTextSize/2, 4.8f*fTextSize, paint); } private: typedef FilterBitmapGM INHERITED; diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 8775b58220..f3f891073c 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -15,7 +15,7 @@ static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x, SkScalar y, const SkPaint& paint) { - canvas->drawText(text.c_str(), text.size(), x, y, paint); + canvas->drawString(text, x, y, paint); return x + paint.measureText(text.c_str(), text.size()); } diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index aecb46e180..bef26f3c18 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -21,7 +21,7 @@ static SkScalar drawString(SkCanvas* canvas, const SkString& text, SkScalar x, SkScalar y, const SkPaint& paint) { - canvas->drawText(text.c_str(), text.size(), x, y, paint); + canvas->drawString(text, x, y, paint); return x + paint.measureText(text.c_str(), text.size()); } diff --git a/gm/gamma.cpp b/gm/gamma.cpp index 864272600e..818895792a 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -63,9 +63,9 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { auto nextRect = [&](const char* label, const char* label2) { canvas->drawRect(r, p); - canvas->drawText(label, strlen(label), 0, sz + textPaint.getFontSpacing(), textPaint); + canvas->drawString(label, 0, sz + textPaint.getFontSpacing(), textPaint); if (label2) { - canvas->drawText(label2, strlen(label2), 0, sz + 2 * textPaint.getFontSpacing(), + canvas->drawString(label2, 0, sz + 2 * textPaint.getFontSpacing(), textPaint); } advance(); @@ -73,7 +73,7 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { auto nextBitmap = [&](const SkBitmap& bmp, const char* label) { canvas->drawBitmap(bmp, 0, 0); - canvas->drawText(label, strlen(label), 0, sz + textPaint.getFontSpacing(), textPaint); + canvas->drawString(label, 0, sz + textPaint.getFontSpacing(), textPaint); advance(); }; @@ -86,12 +86,12 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { SkString srcText = SkStringPrintf("%08X", srcColor); SkString dstText = SkStringPrintf("%08X", dstColor); - canvas->drawText(srcText.c_str(), srcText.size(), 0, sz + textPaint.getFontSpacing(), + canvas->drawString(srcText, 0, sz + textPaint.getFontSpacing(), textPaint); const char* modeName = SkBlendMode_Name(mode); - canvas->drawText(modeName, strlen(modeName), 0, sz + 2 * textPaint.getFontSpacing(), + canvas->drawString(modeName, 0, sz + 2 * textPaint.getFontSpacing(), textPaint); - canvas->drawText(dstText.c_str(), dstText.size(), 0, sz + 3 * textPaint.getFontSpacing(), + canvas->drawString(dstText, 0, sz + 3 * textPaint.getFontSpacing(), textPaint); advance(); }; diff --git a/gm/gamut.cpp b/gm/gamut.cpp index 2aaa2b36d3..9339aa8274 100644 --- a/gm/gamut.cpp +++ b/gm/gamut.cpp @@ -179,8 +179,7 @@ static void draw_gamut_grid(SkCanvas* canvas, SkTArray<std::unique_ptr<CellRende wideGamutCanvas->clear(SK_ColorBLACK); renderer->draw(wideGamutCanvas); - canvas->drawText(renderer->label(), strlen(renderer->label()), x, y + textHeight, - textPaint); + canvas->drawString(renderer->label(), x, y + textHeight, textPaint); // Re-interpret the off-screen images, so we can see the raw data (eg, Wide gamut squares // will look desaturated, relative to sRGB). @@ -82,7 +82,7 @@ void GM::DrawGpuOnlyMessage(SkCanvas* canvas) { paint.setColor(SK_ColorRED); sk_tool_utils::set_portable_typeface(&paint); constexpr char kTxt[] = "GPU Only"; - bmpCanvas.drawText(kTxt, strlen(kTxt), 20, 40, paint); + bmpCanvas.drawString(kTxt, 20, 40, paint); SkMatrix localM; localM.setRotate(35.f); localM.postTranslate(10.f, 0.f); diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index 7f7f22277c..cc0c079d77 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -57,7 +57,7 @@ protected: paint.setShader(make_chrome_solid()); paint.setTextSize(SkIntToScalar(500)); - canvas->drawText("I", 1, 0, 100, paint); + canvas->drawString("I", 0, 100, paint); } private: typedef GM INHERITED; @@ -77,17 +77,17 @@ protected: sk_tool_utils::set_portable_typeface(&paint); paint.setStyle(SkPaint::kFill_Style); - canvas->drawText("Normal Fill Text", 16, 0, 50, paint); + canvas->drawString("Normal Fill Text", 0, 50, paint); paint.setStyle(SkPaint::kStroke_Style); - canvas->drawText("Normal Stroke Text", 18, 0, 100, paint); + canvas->drawString("Normal Stroke Text", 0, 100, paint); // Minimal repro doesn't require AA, LCD, or a nondefault typeface paint.setShader(make_chrome_solid()); paint.setStyle(SkPaint::kFill_Style); - canvas->drawText("Gradient Fill Text", 18, 0, 150, paint); + canvas->drawString("Gradient Fill Text", 0, 150, paint); paint.setStyle(SkPaint::kStroke_Style); - canvas->drawText("Gradient Stroke Text", 20, 0, 200, paint); + canvas->drawString("Gradient Stroke Text", 0, 200, paint); } private: typedef GM INHERITED; diff --git a/gm/highcontrastfilter.cpp b/gm/highcontrastfilter.cpp index e5330d24cf..0c7c5e1de6 100644 --- a/gm/highcontrastfilter.cpp +++ b/gm/highcontrastfilter.cpp @@ -52,7 +52,7 @@ static void draw_scene(SkCanvas* canvas, const SkHighContrastConfig& config) { paint.setARGB(0xff, 0xbb, 0x77, 0x77); paint.setTextSize(0.15f); - canvas->drawText("A", 1, 0.15f, 0.35f, paint); + canvas->drawString("A", 0.15f, 0.35f, paint); bounds = SkRect::MakeLTRB(0.1f, 0.8f, 0.9f, 1.0f); paint.setARGB(0xff, 0xcc, 0xcc, 0xff); @@ -60,7 +60,7 @@ static void draw_scene(SkCanvas* canvas, const SkHighContrastConfig& config) { paint.setARGB(0xff, 0x88, 0x88, 0xbb); paint.setTextSize(0.15f); - canvas->drawText("Z", 1, 0.75f, 0.95f, paint); + canvas->drawString("Z", 0.75f, 0.95f, paint); bounds = SkRect::MakeLTRB(0.1f, 0.4f, 0.9f, 0.6f); SkPoint pts[] = { { 0, 0 }, { 1, 0 } }; diff --git a/gm/image.cpp b/gm/image.cpp index 8e38ae716d..fc7a5ff1e0 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -150,17 +150,17 @@ protected: sk_tool_utils::set_portable_typeface(&textPaint); textPaint.setTextSize(8); - canvas->drawText(kLabel1, strlen(kLabel1), 10, 60, textPaint); - canvas->drawText(kLabel2, strlen(kLabel2), 10, 140, textPaint); - canvas->drawText(kLabel3, strlen(kLabel3), 10, 220, textPaint); - canvas->drawText(kLabel4, strlen(kLabel4), 10, 300, textPaint); - canvas->drawText(kLabel5, strlen(kLabel5), 10, 380, textPaint); - canvas->drawText(kLabel6, strlen(kLabel6), 10, 460, textPaint); - canvas->drawText(kLabel7, strlen(kLabel7), 10, 540, textPaint); - - canvas->drawText(kLabel8, strlen(kLabel8), 80, 10, textPaint); - canvas->drawText(kLabel9, strlen(kLabel9), 160, 10, textPaint); - canvas->drawText(kLabel10, strlen(kLabel10), 265, 10, textPaint); + canvas->drawString(kLabel1, 10, 60, textPaint); + canvas->drawString(kLabel2, 10, 140, textPaint); + canvas->drawString(kLabel3, 10, 220, textPaint); + canvas->drawString(kLabel4, 10, 300, textPaint); + canvas->drawString(kLabel5, 10, 380, textPaint); + canvas->drawString(kLabel6, 10, 460, textPaint); + canvas->drawString(kLabel7, 10, 540, textPaint); + + canvas->drawString(kLabel8, 80, 10, textPaint); + canvas->drawString(kLabel9, 160, 10, textPaint); + canvas->drawString(kLabel10, 265, 10, textPaint); canvas->translate(80, 20); diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index d15f11c745..47d6374c95 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -28,7 +28,7 @@ void imageblurgm_draw(SkScalar fSigmaX, SkScalar fSigmaY, SkCanvas* canvas) { int y = rand.nextULessThan(HEIGHT); textPaint.setColor(sk_tool_utils::color_to_565(rand.nextBits(24) | 0xFF000000)); textPaint.setTextSize(rand.nextRangeScalar(0, 300)); - canvas->drawText(str, strlen(str), SkIntToScalar(x), + canvas->drawString(str, SkIntToScalar(x), SkIntToScalar(y), textPaint); } canvas->restore(); diff --git a/gm/imageblur2.cpp b/gm/imageblur2.cpp index 19c92f3193..b6f9ff5026 100644 --- a/gm/imageblur2.cpp +++ b/gm/imageblur2.cpp @@ -70,11 +70,10 @@ protected: textPaint.setTextSize(textSize); for (int i = 0; i < testStringCount; i++) { - canvas->drawText(kTestStrings[i], - strlen(kTestStrings[i]), - SkIntToScalar(x * dx), - SkIntToScalar(y * dy + textSize * i + textSize), - textPaint); + canvas->drawString(kTestStrings[i], + SkIntToScalar(x * dx), + SkIntToScalar(y * dy + textSize * i + textSize), + textPaint); } canvas->restore(); } diff --git a/gm/imageblurtiled.cpp b/gm/imageblurtiled.cpp index 7d846be370..7f1cfbd630 100644 --- a/gm/imageblurtiled.cpp +++ b/gm/imageblurtiled.cpp @@ -53,7 +53,7 @@ protected: int posY = 0; for (unsigned i = 0; i < SK_ARRAY_COUNT(str); i++) { posY += 100; - canvas->drawText(str[i], strlen(str[i]), SkIntToScalar(0), + canvas->drawString(str[i], SkIntToScalar(0), SkIntToScalar(posY), textPaint); } canvas->restore(); diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index f088f67396..6e347134d3 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -155,7 +155,7 @@ static void draw_text(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> im sk_tool_utils::set_portable_typeface(&paint); paint.setTextSize(r.height()/2); paint.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint); + canvas->drawString("Text", r.centerX(), r.centerY(), paint); } static void draw_bitmap(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) { @@ -271,7 +271,7 @@ protected: SkAutoCanvasRestore acr(canvas, true); for (size_t i = 0; i < SK_ARRAY_COUNT(flags); ++i) { paint.setFlags(flags[i]); - canvas->drawText("Hamburgefons", 11, 0, 0, paint); + canvas->drawString("Hamburgefon", 0, 0, paint); canvas->translate(0, 40); } } diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp index b8db8abefa..5af6492007 100644 --- a/gm/imagefilterscropped.cpp +++ b/gm/imagefilterscropped.cpp @@ -46,7 +46,7 @@ static void draw_text(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> im sk_tool_utils::set_portable_typeface(&paint); paint.setTextSize(r.height()/2); paint.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint); + canvas->drawString("Text", r.centerX(), r.centerY(), paint); } static void draw_bitmap(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) { diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp index a494f4c285..2585ea763c 100644 --- a/gm/imagemagnifier.cpp +++ b/gm/imagemagnifier.cpp @@ -35,7 +35,7 @@ DEF_SIMPLE_GM_BG(imagemagnifier, canvas, WIDTH, HEIGHT, SK_ColorBLACK) { paint.setColor(sk_tool_utils::color_to_565(rand.nextBits(24) | 0xFF000000)); paint.setTextSize(rand.nextRangeScalar(0, 300)); paint.setAntiAlias(true); - canvas->drawText(str, strlen(str), SkIntToScalar(x), + canvas->drawString(str, SkIntToScalar(x), SkIntToScalar(y), paint); } canvas->restore(); diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp index 9fa6be0cdd..257e0b259c 100644 --- a/gm/imageresizetiled.cpp +++ b/gm/imageresizetiled.cpp @@ -43,7 +43,7 @@ DEF_SIMPLE_GM(imageresizetiled, canvas, WIDTH, HEIGHT) { int posY = 0; for (unsigned i = 0; i < SK_ARRAY_COUNT(str); i++) { posY += 100; - canvas->drawText(str[i], strlen(str[i]), SkIntToScalar(0), + canvas->drawString(str[i], SkIntToScalar(0), SkIntToScalar(posY), textPaint); } canvas->restore(); diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp index c873754715..664b4117de 100644 --- a/gm/internal_links.cpp +++ b/gm/internal_links.cpp @@ -64,7 +64,7 @@ private: sk_tool_utils::set_portable_typeface(&paint); paint.setTextSize(SkIntToScalar(25)); paint.setColor(SK_ColorBLACK); - canvas->drawText(text, strlen(text), x, y, paint); + canvas->drawString(text, x, y, paint); } typedef GM INHERITED; diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp index 07b55c56fe..1345d23762 100644 --- a/gm/lcdblendmodes.cpp +++ b/gm/lcdblendmodes.cpp @@ -133,7 +133,7 @@ protected: paint.setShader(make_shader(r)); } SkString string(SkBlendMode_Name(gModes[m])); - canvas->drawText(string.c_str(), string.size(), 0, y, paint); + canvas->drawString(string, 0, y, paint); y+=fTextHeight; } } diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp index 5a549eb74c..41e83d68fd 100644 --- a/gm/lcdtext.cpp +++ b/gm/lcdtext.cpp @@ -58,7 +58,7 @@ protected: paint.setLCDRenderText(lcdRenderTextEnabled); paint.setTextSize(textHeight); - canvas->drawText(string.c_str(), string.size(), 0, y, paint); + canvas->drawString(string, 0, y, paint); y += textHeight; } @@ -120,7 +120,7 @@ protected: paint.setTextSize(rec[i].fTextSize); ScaleAbout(canvas, rec[i].fScale, rec[i].fScale, loc.x(), loc.y()); - canvas->drawText(rec[i].fText, strlen(rec[i].fText), loc.x(), loc.y(), paint); + canvas->drawString(rec[i].fText, loc.x(), loc.y(), paint); } } @@ -138,7 +138,7 @@ DEF_SIMPLE_GM(savelayer_lcdtext, canvas, 620, 260) { paint.setLCDRenderText(true); paint.setTextSize(20); - canvas->drawText("Hamburgefons", 12, 30, 30, paint); + canvas->drawString("Hamburgefons", 30, 30, paint); const bool gPreserveLCDText[] = { false, true }; @@ -149,15 +149,15 @@ DEF_SIMPLE_GM(savelayer_lcdtext, canvas, 620, 260) { if (preserve) { SkPaint noLCD = paint; noLCD.setLCDRenderText(false); - canvas->drawText("LCD not supported", 17, 30, 60, noLCD); + canvas->drawString("LCD not supported", 30, 60, noLCD); } else { - canvas->drawText("Hamburgefons", 12, 30, 60, paint); + canvas->drawString("Hamburgefons", 30, 60, paint); } SkPaint p; p.setColor(0xFFCCCCCC); canvas->drawRect(SkRect::MakeLTRB(25, 70, 200, 100), p); - canvas->drawText("Hamburgefons", 12, 30, 90, paint); + canvas->drawString("Hamburgefons", 30, 90, paint); canvas->restore(); canvas->translate(0, 80); diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index c6c246d353..edec063dd1 100644 --- a/gm/lightingshader2.cpp +++ b/gm/lightingshader2.cpp @@ -171,25 +171,25 @@ protected: canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("useNormalSource: %d", useNormalSource); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("useDiffuseShader: %d", useDiffuseShader); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("useTranslucentPaint: %d", useTranslucentPaint); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("useTranslucentShader: %d", useTranslucentShader); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } canvas->restore(); diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp index 5adf3b8131..9e15a8e7f1 100644 --- a/gm/lightingshaderbevel.cpp +++ b/gm/lightingshaderbevel.cpp @@ -182,13 +182,13 @@ protected: label.append("roundedOut"); break; } - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("bevelHeight: %.1f", bevelHeight); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } canvas->restore(); @@ -218,19 +218,19 @@ protected: canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("bevelType: linear"); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("bevelHeight: %.1f", 7.0f); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } { canvas->translate(0.0f, LABEL_SIZE); SkString label; label.appendf("rotated"); - canvas->drawText(label.c_str(), label.size(), 0.0f, 0.0f, labelPaint); + canvas->drawString(label, 0.0f, 0.0f, labelPaint); } canvas->restore(); diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp index 2583ff17c1..94a297922d 100644 --- a/gm/linepaths.cpp +++ b/gm/linepaths.cpp @@ -83,10 +83,10 @@ static void draw(SkCanvas* canvas, bool doClose) { const char titleClose[] = "Line Closed Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; const char* title = doClose ? titleClose : titleNoClose; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -125,18 +125,15 @@ static void draw(SkCanvas* canvas, bool doClose) { labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index 7c1a2150db..4af12e172d 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -46,7 +46,7 @@ protected: paint.setShader(SkGradientShader::MakeLinear( pts, fColors, pos, 2, SkShader::kClamp_TileMode)); const char* str = "e"; - canvas.drawText(str, strlen(str), SkIntToScalar(-10), SkIntToScalar(80), paint); + canvas.drawString(str, SkIntToScalar(-10), SkIntToScalar(80), paint); // ... tag the data as sRGB, so color-aware devices do gamut adjustment, etc... fBitmap.setInfo(SkImageInfo::MakeS32(80, 80, kPremul_SkAlphaType)); diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp index 56a78f4890..9769cda3f5 100644 --- a/gm/mipmap.cpp +++ b/gm/mipmap.cpp @@ -38,7 +38,7 @@ DEF_SIMPLE_GM(mipmap, canvas, 400, 200) { paint.setTextSize(30); SkString str; str.printf("scale %g %g", dst.width() / img->width(), dst.height() / img->height()); -// canvas->drawText(str.c_str(), str.size(), 300, 100, paint); +// canvas->drawString(str, 300, 100, paint); canvas->translate(20, 20); for (int i = 0; i < 4; ++i) { diff --git a/gm/morphology.cpp b/gm/morphology.cpp index d1513c43d0..99603c1ebc 100644 --- a/gm/morphology.cpp +++ b/gm/morphology.cpp @@ -36,8 +36,8 @@ protected: const char* str2 = "XYZ"; paint.setColor(0xFFFFFFFF); paint.setTextSize(64); - canvas.drawText(str1, strlen(str1), 10, 55, paint); - canvas.drawText(str2, strlen(str2), 10, 110, paint); + canvas.drawString(str1, 10, 55, paint); + canvas.drawString(str2, 10, 110, paint); } SkISize onISize() override { diff --git a/gm/pdf_never_embed.cpp b/gm/pdf_never_embed.cpp index 4fba40e282..ae63432c08 100644 --- a/gm/pdf_never_embed.cpp +++ b/gm/pdf_never_embed.cpp @@ -53,5 +53,5 @@ DEF_SIMPLE_GM(pdf_never_embed, canvas, 512, 512) { canvas->scale(1.0, 0.5); p.setColor(0xF0000080); - canvas->drawText(text, strlen(text), 30, 700, p); + canvas->drawString(text, 30, 700, p); } diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index aaec8505d3..587ed3733b 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -33,7 +33,7 @@ static sk_sp<SkPicture> make_picture() { paint.setColor(0xFFFFFFFF); paint.setTextSize(SkIntToScalar(96)); const char* str = "e"; - canvas->drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); + canvas->drawString(str, SkIntToScalar(20), SkIntToScalar(70), paint); return recorder.finishRecordingAsPicture(); } @@ -50,7 +50,7 @@ static sk_sp<SkPicture> make_LCD_picture() { // this has to be small enough that it doesn't become a path paint.setTextSize(SkIntToScalar(36)); const char* str = "e"; - canvas->drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); + canvas->drawString(str, SkIntToScalar(20), SkIntToScalar(70), paint); return recorder.finishRecordingAsPicture(); } diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp index d664d973c9..f4e45827c1 100644 --- a/gm/pixelsnap.cpp +++ b/gm/pixelsnap.cpp @@ -55,7 +55,7 @@ protected: canvas->translate(0, SkIntToScalar(kLabelOffsetY)); for (int i = 0; i <= kSubPixelSteps; ++i) { offset.printf("%d", i); - canvas->drawText(offset.c_str(), offset.size(), + canvas->drawString(offset, 0, i * kTrans + labelPaint.getTextSize(), labelPaint); } @@ -66,7 +66,7 @@ protected: canvas->translate(SkIntToScalar(kLabelOffsetX), 0); for (int i = 0; i <= kSubPixelSteps; ++i) { offset.printf("%d", i); - canvas->drawText(offset.c_str(), offset.size(), + canvas->drawString(offset, i * SkIntToScalar(kTrans), labelPaint.getTextSize(), labelPaint); } diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp index 9434bf2658..2b9b390eb1 100644 --- a/gm/poly2poly.cpp +++ b/gm/poly2poly.cpp @@ -73,8 +73,7 @@ void SkJSCanvas::stroke() { } void SkJSCanvas::fillText(const char text[], double x, double y) { - fTarget->drawText(text, strlen(text), - SkDoubleToScalar(x), SkDoubleToScalar(y), fFillPaint); + fTarget->drawString(text, SkDoubleToScalar(x), SkDoubleToScalar(y), fFillPaint); } /////////////////////////////////////////////////////////////////////////////// diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index bac37b9234..fb106859a4 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -90,10 +90,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Quad Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -132,18 +132,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } @@ -234,10 +231,10 @@ protected: titlePaint.setTextSize(15 * SK_Scalar1); const char title[] = "Quad Closed Drawn Into Rectangle Clips With " "Indicated Style, Fill and Linecaps, with stroke width 10"; - canvas->drawText(title, strlen(title), - 20 * SK_Scalar1, - 20 * SK_Scalar1, - titlePaint); + canvas->drawString(title, + 20 * SK_Scalar1, + 20 * SK_Scalar1, + titlePaint); SkRandom rand; SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1); @@ -276,18 +273,15 @@ protected: labelPaint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(10 * SK_Scalar1); - canvas->drawText(gStyles[style].fName, - strlen(gStyles[style].fName), - 0, rect.height() + 12 * SK_Scalar1, - labelPaint); - canvas->drawText(gFills[fill].fName, - strlen(gFills[fill].fName), - 0, rect.height() + 24 * SK_Scalar1, - labelPaint); - canvas->drawText(gCaps[cap].fName, - strlen(gCaps[cap].fName), - 0, rect.height() + 36 * SK_Scalar1, - labelPaint); + canvas->drawString(gStyles[style].fName, + 0, rect.height() + 12 * SK_Scalar1, + labelPaint); + canvas->drawString(gFills[fill].fName, + 0, rect.height() + 24 * SK_Scalar1, + labelPaint); + canvas->drawString(gCaps[cap].fName, + 0, rect.height() + 36 * SK_Scalar1, + labelPaint); } canvas->restore(); } diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index 67ffa9a08c..5b3dc224e2 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -138,7 +138,7 @@ protected: SkPaint paint; paint.setAntiAlias(true); const char* kMsg = "Could not create rectangle texture image."; - canvas->drawText(kMsg, strlen(kMsg), 10, 100, paint); + canvas->drawString(kMsg, 10, 100, paint); return; } diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp index 63873499bc..f3287437ee 100644 --- a/gm/samplerstress.cpp +++ b/gm/samplerstress.cpp @@ -111,7 +111,7 @@ protected: canvas->clipPath(path, true); // AA is on - canvas->drawText("M", 1, + canvas->drawString("M", SkIntToScalar(100), SkIntToScalar(100), paint); @@ -126,7 +126,7 @@ protected: paint2.setStyle(SkPaint::kStroke_Style); paint2.setStrokeWidth(1); sk_tool_utils::set_portable_typeface(&paint2); - canvas->drawText("M", 1, + canvas->drawString("M", SkIntToScalar(100), SkIntToScalar(100), paint2); diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 9b585bf4d6..d23409a5a5 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -107,14 +107,14 @@ DEF_SIMPLE_GM_BG(shadertext2, canvas, 1800, 900, canvas->translate(0, bmp.height() + labelPaint.getTextSize() + 15.f); constexpr char kLabelLabel[] = "localM / canvasM"; - canvas->drawText(kLabelLabel, strlen(kLabelLabel), 0, 0, labelPaint); + canvas->drawString(kLabelLabel, 0, 0, labelPaint); canvas->translate(0, 15.f); canvas->save(); SkScalar maxLabelW = 0; canvas->translate(0, kPadY / 2 + kPointSize); for (int lm = 0; lm < localMatrices.count(); ++lm) { - canvas->drawText(matrices[lm].fLabel, strlen(matrices[lm].fLabel), + canvas->drawString(matrices[lm].fLabel, 0, labelPaint.getTextSize() - 1, labelPaint); SkScalar labelW = labelPaint.measureText(matrices[lm].fLabel, strlen(matrices[lm].fLabel)); @@ -132,7 +132,7 @@ DEF_SIMPLE_GM_BG(shadertext2, canvas, 1800, 900, for (int m = 0; m < matrices.count(); ++m) { columnH = 0; canvas->save(); - canvas->drawText(matrices[m].fLabel, strlen(matrices[m].fLabel), + canvas->drawString(matrices[m].fLabel, 0, labelPaint.getTextSize() - 1, labelPaint); canvas->translate(0, kPadY / 2 + kPointSize); columnH += kPadY / 2 + kPointSize; @@ -178,8 +178,8 @@ DEF_SIMPLE_GM_BG(shadertext2, canvas, 1800, 900, SkScalar y = columnH + kPadY / 2; SkScalar fillX = -outlinePaint.measureText(kFillLabel, strlen(kFillLabel)) - kPadX; SkScalar strokeX = kPadX; - canvas->drawText(kFillLabel, strlen(kFillLabel), fillX, y, labelPaint); - canvas->drawText(kStrokeLabel, strlen(kStrokeLabel), strokeX, y, labelPaint); + canvas->drawString(kFillLabel, fillX, y, labelPaint); + canvas->drawString(kStrokeLabel, strokeX, y, labelPaint); } } } diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp index 4c7407dedb..5e4067f966 100644 --- a/gm/simpleaaclip.cpp +++ b/gm/simpleaaclip.cpp @@ -162,7 +162,7 @@ protected: int xOff = 0; for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); op++) { - canvas->drawText(gOps[op].fName, strlen(gOps[op].fName), + canvas->drawString(gOps[op].fName, SkIntToScalar(75), SkIntToScalar(50), textPaint); diff --git a/gm/skbug_257.cpp b/gm/skbug_257.cpp index fb77532fa1..91c0a1665e 100644 --- a/gm/skbug_257.cpp +++ b/gm/skbug_257.cpp @@ -66,7 +66,7 @@ static void test_text(SkCanvas* canvas, SkScalar size, sk_tool_utils::set_portable_typeface(&type); type.setColor(color); const char text[] = "HELLO WORLD"; - canvas->drawText(text, strlen(text), 32, size / 2 + Y, type); + canvas->drawString(text, 32, size / 2 + Y, type); SkScalar lineSpacing = type.getFontSpacing(); exercise_draw_pos_text(canvas, text, 32, size / 2 + Y + lineSpacing, type); exercise_draw_pos_text_h(canvas, text, 32, diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 75721f1de4..e43933ce11 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -53,7 +53,7 @@ static void draw_oval(SkCanvas* canvas, const SkPaint& paint) { static void draw_text(SkCanvas* canvas, const SkPaint& paint) { SkPaint p(paint); p.setTextSize(H/4); - canvas->drawText("Hamburge", 8, 0, H*2/3, p); + canvas->drawString("Hamburge", 0, H*2/3, p); } class SrcModeGM : public skiagm::GM { diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp index f1bb32732a..ec939d1936 100644 --- a/gm/stroketext.cpp +++ b/gm/stroketext.cpp @@ -31,7 +31,7 @@ static void draw_text_stroked(SkCanvas* canvas, const SkPaint& paint, SkScalar s if (strokeWidth > 0) { p.setStyle(SkPaint::kFill_Style); - canvas->drawText("P", 1, loc.fX, loc.fY - 225, p); + canvas->drawString("P", loc.fX, loc.fY - 225, p); canvas->drawPosText("P", 1, &loc, p); } @@ -39,7 +39,7 @@ static void draw_text_stroked(SkCanvas* canvas, const SkPaint& paint, SkScalar s p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(strokeWidth); - canvas->drawText("P", 1, loc.fX, loc.fY - 225, p); + canvas->drawString("P", loc.fX, loc.fY - 225, p); canvas->drawPosText("P", 1, &loc, p); } diff --git a/gm/surface.cpp b/gm/surface.cpp index ee4deccacf..4b400caa44 100644 --- a/gm/surface.cpp +++ b/gm/surface.cpp @@ -46,7 +46,7 @@ static void test_draw(SkCanvas* canvas, const char label[]) { paint.setTextSize(32); paint.setTextAlign(SkPaint::kCenter_Align); sk_tool_utils::set_portable_typeface(&paint); - canvas->drawText(label, strlen(label), W / 2, H * 3 / 4, paint); + canvas->drawString(label, W / 2, H * 3 / 4, paint); } class SurfacePropsGM : public skiagm::GM { diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index 5e0f189d61..b98aea714e 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -188,7 +188,7 @@ DEF_SIMPLE_GM(texteffects, canvas, 460, 680) { // paint.setMaskFilter(nullptr); // paint.setColor(SK_ColorBLACK); - canvas->drawText(str.c_str(), str.size(), x, y, paint); + canvas->drawString(str, x, y, paint); y += paint.getFontSpacing(); } diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp index 009ad6421d..390ce4adcd 100644 --- a/gm/tilemodes.cpp +++ b/gm/tilemodes.cpp @@ -105,7 +105,7 @@ protected: str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]); p.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText(str.c_str(), str.size(), x + r.width()/2, y, p); + canvas->drawString(str, x + r.width()/2, y, p); x += r.width() * 4 / 3; } @@ -142,7 +142,7 @@ protected: p.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&p); str.printf("%s, %s", gConfigNames[i], gFilterNames[j]); - canvas->drawText(str.c_str(), str.size(), x, y + r.height() * 2 / 3, p); + canvas->drawString(str, x, y + r.height() * 2 / 3, p); } y += r.height() * 4 / 3; @@ -224,7 +224,7 @@ protected: for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) { SkString str(gModeNames[kx]); - canvas->drawText(str.c_str(), str.size(), x + r.width()/2, y, p); + canvas->drawString(str, x + r.width()/2, y, p); x += r.width() * 4 / 3; } @@ -235,7 +235,7 @@ protected: x = SkIntToScalar(16) + w; SkString str(gModeNames[ky]); - canvas->drawText(str.c_str(), str.size(), x, y + h/2, p); + canvas->drawString(str, x, y + h/2, p); x += SkIntToScalar(50); for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) { diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 807d63b369..3833fa2943 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -107,7 +107,7 @@ protected: str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]); p.setTextAlign(SkPaint::kCenter_Align); - canvas->drawText(str.c_str(), str.size(), scale*(x + r.width()/2), y, p); + canvas->drawString(str, scale*(x + r.width()/2), y, p); x += r.width() * 4 / 3; } @@ -145,7 +145,7 @@ protected: p.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&p); str.printf("%s, %s", gColorTypeNames[i], gFilterNames[j]); - canvas->drawText(str.c_str(), str.size(), scale*x, scale*(y + r.height() * 2 / 3), p); + canvas->drawString(str, scale*x, scale*(y + r.height() * 2 / 3), p); } y += r.height() * 4 / 3; @@ -228,7 +228,7 @@ protected: for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) { SkString str(gModeNames[kx]); - canvas->drawText(str.c_str(), str.size(), x + r.width()/2, y, p); + canvas->drawString(str, x + r.width()/2, y, p); x += r.width() * 4 / 3; } @@ -239,7 +239,7 @@ protected: x = SkIntToScalar(16) + w; SkString str(gModeNames[ky]); - canvas->drawText(str.c_str(), str.size(), x, y + h/2, p); + canvas->drawString(str, x, y + h/2, p); x += SkIntToScalar(50); for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) { diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index 563d138fc7..c0f6cbf8c7 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -116,7 +116,7 @@ protected: canvas->save(); canvas->clipRect(fClipRects[i]); canvas->translate(fPositions[i].fX, fPositions[i].fY); - canvas->drawText(fStrings[i].c_str(), fStrings[i].size(), 0, 0, fPaint); + canvas->drawString(fStrings[i], 0, 0, fPaint); canvas->restore(); } diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp index d7da041896..a0ebd01812 100644 --- a/gm/verttext2.cpp +++ b/gm/verttext2.cpp @@ -76,7 +76,7 @@ protected: paint.setTypeface(std::move(family)); paint.setTextSize(textHeight); - canvas->drawText(string.c_str(), string.size(), y, + canvas->drawString(string, y, SkIntToScalar(alignment == SkPaint::kLeft_Align ? 10 : 240), paint); y += textHeight; diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp index 544f5e0c71..7083487997 100644 --- a/gm/windowrectangles.cpp +++ b/gm/windowrectangles.cpp @@ -284,7 +284,7 @@ void WindowRectanglesMaskGM::fail(SkCanvas* canvas) { canvas->clipRect(SkRect::Make(kCoverRect)); canvas->clear(SK_ColorWHITE); - canvas->drawText(errorMsg.c_str(), errorMsg.size(), SkIntToScalar(kCoverRect.centerX()), + canvas->drawString(errorMsg, SkIntToScalar(kCoverRect.centerX()), SkIntToScalar(kCoverRect.centerY() - 10), paint); } diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index 5d23104ad0..9bf46f6eb5 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -259,7 +259,7 @@ protected: #if 1 const char* label = SkBlendMode_Name(gModes[i].fMode); - canvas->drawText(label, strlen(label), + canvas->drawString(label, x + w/2, y - labelP.getTextSize()/2, labelP); #endif x += w + SkIntToScalar(10); diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 891a864cf9..2db824d95b 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -72,8 +72,8 @@ protected: canvas->restore(); #if 1 - canvas->drawText(SkBlendMode_Name(mode), strlen(SkBlendMode_Name(mode)), - x + w/2, y - labelP.getTextSize()/2, labelP); + canvas->drawString(SkBlendMode_Name(mode), + x + w/2, y - labelP.getTextSize()/2, labelP); #endif x += w + SkIntToScalar(10); if ((m % W) == W - 1) { diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index 6e4d8b81bc..9c78658ae7 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -71,8 +71,7 @@ protected: for (size_t s = 0; s < SK_ARRAY_COUNT(kStrokes); ++s) { for (size_t m = 0; m <= (size_t)SkBlendMode::kLastMode; ++m) { SkBlendMode mode = static_cast<SkBlendMode>(m); - canvas->drawText(SkBlendMode_Name(mode), - strlen(SkBlendMode_Name(mode)), + canvas->drawString(SkBlendMode_Name(mode), SkIntToScalar(x), SkIntToScalar(y + kSize + 3) + labelP.getTextSize(), labelP); |