sed s/drawSimpleText/drawString/
for f in $(git grep -l drawSimpleText); do
sed -i 's/wSimpleText(\([[:alnum:]]\), strlen(\1), kUTF8_SkTextEncoding,/wString(\1,/g' "$f"
sed -i 's/wSimpleText(\([[:alnum:]]*\)\.c_str(), \1\.size(), kUTF8_SkTextEncoding,/wString(\1,/g' "$f"
done
git checkout @~ include/core/SkCanvas.h samplecode/SampleCusp.cpp
git cl format
Change-Id: Ibc0c3afd30f86465a645fadb26177d61919f57fd
Reviewed-on: https://skia-review.googlesource.com/c/181561
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
diff --git a/gm/animatedGif.cpp b/gm/animatedGif.cpp
index 72116eb..271f8f4 100644
--- a/gm/animatedGif.cpp
+++ b/gm/animatedGif.cpp
@@ -29,8 +29,7 @@
SkFont font;
SkRect bounds;
font.measureText(errorText.c_str(), errorText.size(), kUTF8_SkTextEncoding, &bounds);
- canvas->drawSimpleText(errorText.c_str(), errorText.size(), kUTF8_SkTextEncoding,
- kOffset, bounds.height() + kOffset, font, paint);
+ canvas->drawString(errorText, kOffset, bounds.height() + kOffset, font, paint);
}
}
diff --git a/gm/arithmode.cpp b/gm/arithmode.cpp
index 7a25c2e..adf71ce 100644
--- a/gm/arithmode.cpp
+++ b/gm/arithmode.cpp
@@ -61,7 +61,7 @@
SkString str;
str.appendScalar(k[i]);
SkScalar width = font.measureText(str.c_str(), str.size(), kUTF8_SkTextEncoding);
- canvas->drawSimpleText(str.c_str(), str.size(), kUTF8_SkTextEncoding, x, y + font.getSize(), font, paint);
+ canvas->drawString(str, x, y + font.getSize(), font, paint);
x += width + SkIntToScalar(10);
}
}
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index 2f3bb1c..2e676a2 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -133,19 +133,17 @@
// get the bounds of the text in order to position it
labelFont.measureText(inputLabel.c_str(), inputLabel.size(),
kUTF8_SkTextEncoding, &inputLabelBounds);
- canvas->drawSimpleText(inputLabel.c_str(), inputLabel.size(), kUTF8_SkTextEncoding,
- renderRect.fRight + kPad,
- -inputLabelBounds.fTop, labelFont, labelPaint);
+ canvas->drawString(inputLabel, renderRect.fRight + kPad, -inputLabelBounds.fTop,
+ labelFont, labelPaint);
// update the bounds to reflect the offset we used to draw it.
inputLabelBounds.offset(renderRect.fRight + kPad, -inputLabelBounds.fTop);
SkRect procLabelBounds;
labelFont.measureText(procLabel.c_str(), procLabel.size(),
kUTF8_SkTextEncoding, &procLabelBounds);
- canvas->drawSimpleText(procLabel.c_str(), procLabel.size(), kUTF8_SkTextEncoding,
- renderRect.fRight + kPad,
- inputLabelBounds.fBottom + 2.f - procLabelBounds.fTop,
- labelFont, labelPaint);
+ canvas->drawString(procLabel, renderRect.fRight + kPad,
+ inputLabelBounds.fBottom + 2.f - procLabelBounds.fTop,
+ labelFont, labelPaint);
procLabelBounds.offset(renderRect.fRight + kPad,
inputLabelBounds.fBottom + 2.f - procLabelBounds.fTop);
diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp
index 9fedec2..052de62 100644
--- a/gm/fontcache.cpp
+++ b/gm/fontcache.cpp
@@ -23,7 +23,7 @@
static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x,
SkScalar y, const SkFont& font) {
SkPaint paint;
- canvas->drawSimpleText(text.c_str(), text.size(), kUTF8_SkTextEncoding, x, y, font, paint);
+ canvas->drawString(text, x, y, font, paint);
return x + font.measureText(text.c_str(), text.size(), kUTF8_SkTextEncoding);
}
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 182b9dd..3d367b4 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -20,7 +20,7 @@
static SkScalar drawString(SkCanvas* canvas, const SkString& text, SkScalar x,
SkScalar y, const SkFont& font) {
- canvas->drawSimpleText(text.c_str(), text.size(), kUTF8_SkTextEncoding, x, y, font, SkPaint());
+ canvas->drawString(text, x, y, font, SkPaint());
return x + font.measureText(text.c_str(), text.size(), kUTF8_SkTextEncoding);
}
@@ -277,8 +277,7 @@
if (FLAGS_veryVerbose) {
SkString name;
font.getTypeface()->getFamilyName(&name);
- canvas->drawSimpleText(name.c_str(), name.size(), kUTF8_SkTextEncoding,
- fontBounds.fLeft, fontBounds.fBottom, labelFont, SkPaint());
+ canvas->drawString(name, fontBounds.fLeft, fontBounds.fBottom, labelFont, SkPaint());
}
for (size_t i = 0; i < SK_ARRAY_COUNT(str); ++i) {
SkPath path;
@@ -292,8 +291,7 @@
if (FLAGS_veryVerbose) {
SkString glyphStr;
glyphStr.appendS32(str[i]);
- canvas->drawSimpleText(glyphStr.c_str(), glyphStr.size(), kUTF8_SkTextEncoding,
- location[i].fX, location[i].fY, labelFont, SkPaint());
+ canvas->drawString(glyphStr, location[i].fX, location[i].fY, labelFont, SkPaint());
}
}
diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp
index bd1a611..0e4abc7 100644
--- a/gm/wacky_yuv_formats.cpp
+++ b/gm/wacky_yuv_formats.cpp
@@ -658,7 +658,7 @@
font.measureText(rowLabel.c_str(), rowLabel.size(), kUTF8_SkTextEncoding, &textRect);
y += kTileWidthHeight/2 + textRect.height()/2;
- canvas->drawSimpleText(rowLabel.c_str(), rowLabel.size(), kUTF8_SkTextEncoding, 0, y, font, paint);
+ canvas->drawString(rowLabel, 0, y, font, paint);
}
static GrBackendTexture create_yuva_texture(GrGpu* gpu, const SkBitmap& bm,
diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
index 9208ad1..af3ebf2 100644
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp
@@ -611,10 +611,9 @@
canvas->drawLine(fBounds.fLeft - 5, fYLo, fBounds.fRight + 5, fYLo, paints.fIndicator);
SkString label;
label.printf("%0.3g", fValLo);
- canvas->drawSimpleText(label.c_str(), label.size(), kUTF8_SkTextEncoding,
- fBounds.fLeft + 5, fYLo - 5, paints.fValueFont, paints.fValue);
- canvas->drawSimpleText(fName.c_str(), fName.size(), kUTF8_SkTextEncoding,
- fBounds.fLeft, fBounds.bottom() + 11, paints.fLabelFont, paints.fLabel);
+ canvas->drawString(label, fBounds.fLeft + 5, fYLo - 5, paints.fValueFont, paints.fValue);
+ canvas->drawString(fName, fBounds.fLeft, fBounds.bottom() + 11, paints.fLabelFont,
+ paints.fLabel);
}
};
diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index a7e86d6..ba46a87 100644
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -126,8 +126,7 @@
font.setSize(16);
// canvas->drawString(outString, 512.f, 540.f, paint);
- canvas->drawSimpleText(modeString.c_str(), modeString.size(), kUTF8_SkTextEncoding,
- 768.f, 540.f, font, paint);
+ canvas->drawString(modeString, 768.f, 540.f, font, paint);
}
bool onAnimate(const SkAnimTimer& timer) override {
diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp
index 32c5fec..7392c66 100644
--- a/samplecode/SampleDegenerateTwoPtRadials.cpp
+++ b/samplecode/SampleDegenerateTwoPtRadials.cpp
@@ -69,8 +69,8 @@
draw_gradient2(canvas, SkRect::MakeXYWH(l, t, w, h), delta);
SkString txt;
txt.appendf("gap at \"tangent\" pt = %f", SkScalarToFloat(delta));
- canvas->drawSimpleText(txt.c_str(), txt.size(), kUTF8_SkTextEncoding,
- l + w/2 + w*DELTA_SCALE*delta, t + h + SK_Scalar1 * 10, SkFont(), SkPaint());
+ canvas->drawString(txt, l + w / 2 + w * DELTA_SCALE * delta, t + h + SK_Scalar1 * 10,
+ SkFont(), SkPaint());
}
bool onAnimate(const SkAnimTimer& timer) override {
diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index 10fc2e8..2e7f92f 100644
--- a/samplecode/SampleRectanizer.cpp
+++ b/samplecode/SampleRectanizer.cpp
@@ -122,16 +122,13 @@
100.0f * totArea / ((float)kWidth*kHeight),
fCurRandRect,
kNumRandRects);
- canvas->drawSimpleText(str.c_str(), str.size(), kUTF8_SkTextEncoding,
- 50, kHeight + 50, blackBigFont, SkPaint());
+ canvas->drawString(str, 50, kHeight + 50, blackBigFont, SkPaint());
str.printf("Press \'j\' to toggle rectanizer");
- canvas->drawSimpleText(str.c_str(), str.size(), kUTF8_SkTextEncoding,
- 50, kHeight + 100, blackBigFont, SkPaint());
+ canvas->drawString(str, 50, kHeight + 100, blackBigFont, SkPaint());
str.printf("Press \'h\' to toggle rects");
- canvas->drawSimpleText(str.c_str(), str.size(), kUTF8_SkTextEncoding,
- 50, kHeight + 150, blackBigFont, SkPaint());
+ canvas->drawString(str, 50, kHeight + 150, blackBigFont, SkPaint());
}
private:
diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp
index feca632..2e95181 100644
--- a/samplecode/SampleShip.cpp
+++ b/samplecode/SampleShip.cpp
@@ -151,7 +151,7 @@
paint.setColor(SK_ColorBLACK);
canvas->drawRect(SkRect::MakeXYWH(0, 0, 200, 24), paint);
paint.setColor(SK_ColorWHITE);
- canvas->drawSimpleText(outString.c_str(), outString.size(), kUTF8_SkTextEncoding, 5, 15, font, paint);
+ canvas->drawString(outString, 5, 15, font, paint);
}
#if 0
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index aa175eb..43b4827 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -155,8 +155,7 @@
SkString str("9");
- canvas->drawSimpleText(str.c_str(), str.size(), kUTF8_SkTextEncoding,
- x, y, font, SkPaint());
+ canvas->drawString(str, x, y, font, SkPaint());
drawdots(canvas, str, x, y, font);
if (false) {
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 981ec9d..da7e42d 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -90,7 +90,7 @@
} else {
failure.printf("Failed to decode %s", fCurrFile.c_str());
}
- canvas->drawSimpleText(failure.c_str(), failure.size(), kUTF8_SkTextEncoding, 0, height, font, paint);
+ canvas->drawString(failure, 0, height, font, paint);
return;
}
@@ -98,16 +98,16 @@
SkString header(SkOSPath::Basename(fCurrFile.c_str()));
header.appendf(" [%dx%d] %s", fBitmap.width(), fBitmap.height(),
(fPremul ? "premultiplied" : "unpremultiplied"));
- canvas->drawSimpleText(header.c_str(), header.size(), kUTF8_SkTextEncoding, 0, height, font, paint);
+ canvas->drawString(header, 0, height, font, paint);
canvas->translate(0, height);
// Help messages
header.printf("Press '%c' to move to the next image.'", fNextImageChar);
- canvas->drawSimpleText(header.c_str(), header.size(), kUTF8_SkTextEncoding, 0, height, font, paint);
+ canvas->drawString(header, 0, height, font, paint);
canvas->translate(0, height);
header.printf("Press '%c' to toggle premultiplied decode.", fTogglePremulChar);
- canvas->drawSimpleText(header.c_str(), header.size(), kUTF8_SkTextEncoding, 0, height, font, paint);
+ canvas->drawString(header, 0, height, font, paint);
// Now draw the image itself.
canvas->translate(height * 2, height * 2);
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index d142cee..42fc8a1 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -431,8 +431,7 @@
EXPECT_COPY_ON_WRITE(drawBitmap(testBitmap, 0, 0))
EXPECT_COPY_ON_WRITE(drawBitmapRect(testBitmap, testRect, nullptr))
EXPECT_COPY_ON_WRITE(drawBitmapNine(testBitmap, testIRect, testRect, nullptr))
- EXPECT_COPY_ON_WRITE(drawSimpleText(testText.c_str(), testText.size(), kUTF8_SkTextEncoding, \
- 0, 1, SkFont(), testPaint))
+ EXPECT_COPY_ON_WRITE(drawString(testText, 0, 1, SkFont(), testPaint))
}
DEF_TEST(SurfaceCopyOnWrite, reporter) {
test_copy_on_write(reporter, create_surface().get());
diff --git a/tools/sk_app/CommandSet.cpp b/tools/sk_app/CommandSet.cpp
index c021a83..52d956c 100644
--- a/tools/sk_app/CommandSet.cpp
+++ b/tools/sk_app/CommandSet.cpp
@@ -153,8 +153,7 @@
canvas->drawSimpleText(cmd.fKeyName.c_str(), cmd.fKeyName.size(), kUTF8_SkTextEncoding,
x, y, font, paint);
SkString text = SkStringPrintf(": %s", cmd.fDescription.c_str());
- canvas->drawSimpleText(text.c_str(), text.size(), kUTF8_SkTextEncoding,
- x + keyWidth, y, font, paint);
+ canvas->drawString(text, x + keyWidth, y, font, paint);
y += font.getSize() + 2;
}
}
