Use SkTextEncoding enum instead of macros.
Change-Id: I4b6259590fa0693ee0522b4999a1c0fe250b173d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212504
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
index 225d9bc..144141b 100644
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp
@@ -540,7 +540,7 @@
return;
}
canvas->drawRect(fBounds, paints.fStates[fState]);
- SkTextUtils::Draw(canvas, &fLabel, 1, kUTF8_SkTextEncoding, fBounds.centerX(), fBounds.fBottom - 5,
+ SkTextUtils::Draw(canvas, &fLabel, 1, SkTextEncoding::kUTF8, fBounds.centerX(), fBounds.fBottom - 5,
paints.fLabelFont, SkPaint(), SkTextUtils::kCenter_Align);
}
diff --git a/samplecode/SampleAnimatedImage.cpp b/samplecode/SampleAnimatedImage.cpp
index d603259..eabce6b 100644
--- a/samplecode/SampleAnimatedImage.cpp
+++ b/samplecode/SampleAnimatedImage.cpp
@@ -38,10 +38,10 @@
kPauseKey, kResetKey);
const char* text = str.c_str();
SkRect bounds;
- font.measureText(text, strlen(text), kUTF8_SkTextEncoding, &bounds);
+ font.measureText(text, strlen(text), SkTextEncoding::kUTF8, &bounds);
fYOffset = bounds.height();
- canvas->drawSimpleText(text, strlen(text), kUTF8_SkTextEncoding, 5, fYOffset, font, SkPaint());
+ canvas->drawSimpleText(text, strlen(text), SkTextEncoding::kUTF8, 5, fYOffset, font, SkPaint());
fYOffset *= 2;
}
diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index 079eafc..696be8d 100644
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -27,7 +27,7 @@
const SkFont& font, const SkPaint& paint) {
SkFont f(font);
f.setSubpixel(true);
- canvas->drawSimpleText(text, length, kUTF8_SkTextEncoding, x, y, f, paint);
+ canvas->drawSimpleText(text, length, SkTextEncoding::kUTF8, x, y, f, paint);
}
// This sample demonstrates the cache behavior of bitmap vs. distance field text
diff --git a/samplecode/SampleAtlas.cpp b/samplecode/SampleAtlas.cpp
index 22c8861..4ea32b3 100644
--- a/samplecode/SampleAtlas.cpp
+++ b/samplecode/SampleAtlas.cpp
@@ -57,7 +57,7 @@
paint.setColor(rand.nextU());
paint.setAlpha(0xFF);
int index = i % strlen(s);
- SkTextUtils::Draw(canvas, &s[index], 1, kUTF8_SkTextEncoding,
+ SkTextUtils::Draw(canvas, &s[index], 1, SkTextEncoding::kUTF8,
x + half, y + half + half/2, font, paint,
SkTextUtils::kCenter_Align);
i += 1;
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 2bc2ba0..abbbc38 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -161,14 +161,14 @@
SkFont font;
font.setSize(SkIntToScalar(BIG_H));
- const int BIG_W = SkScalarRoundToInt(font.measureText(gText, strlen(gText), kUTF8_SkTextEncoding));
+ const int BIG_W = SkScalarRoundToInt(font.measureText(gText, strlen(gText), SkTextEncoding::kUTF8));
bm->allocN32Pixels(BIG_W, BIG_H);
bm->eraseColor(SK_ColorWHITE);
SkCanvas canvas(*bm);
- canvas.drawSimpleText(gText, strlen(gText), kUTF8_SkTextEncoding, 0, font.getSize()*4/5, font, SkPaint());
+ canvas.drawSimpleText(gText, strlen(gText), SkTextEncoding::kUTF8, 0, font.getSize()*4/5, font, SkPaint());
}
class BitmapRectView2 : public Sample {
diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index 1c2d7d3..e9631f2 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -95,7 +95,7 @@
ToolUtils::add_to_text_blob_w_len(&builder,
(const char*)glyphs,
kWordLength * 4,
- kUTF32_SkTextEncoding,
+ SkTextEncoding::kUTF32,
font,
0,
0);
@@ -224,7 +224,7 @@
ToolUtils::add_to_text_blob_w_len(&builder,
(const char*)glyphs,
currentLineLength * 4,
- kUTF32_SkTextEncoding,
+ SkTextEncoding::kUTF32,
font,
0,
y);
diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index 59065cb..a898c37 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -129,14 +129,14 @@
SkScalar txtX = SkIntToScalar(55);
paint.setColor(colorA);
const char* aTxt = invA ? "InverseA " : "A ";
- canvas->drawSimpleText(aTxt, strlen(aTxt), kUTF8_SkTextEncoding, txtX, SkIntToScalar(220), font, paint);
- txtX += font.measureText(aTxt, strlen(aTxt), kUTF8_SkTextEncoding);
+ canvas->drawSimpleText(aTxt, strlen(aTxt), SkTextEncoding::kUTF8, txtX, SkIntToScalar(220), font, paint);
+ txtX += font.measureText(aTxt, strlen(aTxt), SkTextEncoding::kUTF8);
paint.setColor(SK_ColorBLACK);
- canvas->drawSimpleText(gOps[op].fName, strlen(gOps[op].fName), kUTF8_SkTextEncoding,
+ canvas->drawSimpleText(gOps[op].fName, strlen(gOps[op].fName), SkTextEncoding::kUTF8,
txtX, 220, font, paint);
- txtX += font.measureText(gOps[op].fName, strlen(gOps[op].fName), kUTF8_SkTextEncoding);
+ txtX += font.measureText(gOps[op].fName, strlen(gOps[op].fName), SkTextEncoding::kUTF8);
paint.setColor(colorB);
- canvas->drawSimpleText("B", 1, kUTF8_SkTextEncoding, txtX, 220, font, paint);
+ canvas->drawSimpleText("B", 1, SkTextEncoding::kUTF8, txtX, 220, font, paint);
canvas->translate(SkIntToScalar(250),0);
}
diff --git a/samplecode/SampleCusp.cpp b/samplecode/SampleCusp.cpp
index b287bbd..59e5a62 100644
--- a/samplecode/SampleCusp.cpp
+++ b/samplecode/SampleCusp.cpp
@@ -167,7 +167,7 @@
canvas->drawPath(path, p);
// draw time to make it easier to guess when the bad cubic was drawn
std::string timeStr = std::to_string((float) (curTime - start) / 1000.f);
- canvas->drawSimpleText(timeStr.c_str(), timeStr.size(), kUTF8_SkTextEncoding, 20, 20, SkFont(), SkPaint());
+ canvas->drawSimpleText(timeStr.c_str(), timeStr.size(), SkTextEncoding::kUTF8, 20, 20, SkFont(), SkPaint());
SkDebugf("");
}
diff --git a/samplecode/SampleFontCache.cpp b/samplecode/SampleFontCache.cpp
index d9f4f04..75d35b8 100644
--- a/samplecode/SampleFontCache.cpp
+++ b/samplecode/SampleFontCache.cpp
@@ -17,7 +17,7 @@
SkRandom rand;
paint.setAntiAlias(true);
- paint.setTextEncoding(kUTF16_SkTextEncoding);
+ paint.setTextEncoding(SkTextEncoding::kUTF16);
for (int j = 0; j < SK_ARRAY_COUNT(text); j++)
text[j] = (uint16_t)((rand.nextU() & 0xFF) + 32);
@@ -36,7 +36,7 @@
SkRandom rand;
paint.setAntiAlias(true);
- paint.setTextEncoding(kUTF16_SkTextEncoding);
+ paint.setTextEncoding(SkTextEncoding::kUTF16);
for (int j = 0; j < SK_ARRAY_COUNT(text); j++)
text[j] = (uint16_t)((rand.nextU() & 0xFF) + 32);
diff --git a/samplecode/SampleGlyphTransform.cpp b/samplecode/SampleGlyphTransform.cpp
index 35058e0..c81939b 100644
--- a/samplecode/SampleGlyphTransform.cpp
+++ b/samplecode/SampleGlyphTransform.cpp
@@ -55,8 +55,8 @@
// d3 by default anchors text around the middle
SkRect bounds;
- font.measureText(text, strlen(text), kUTF8_SkTextEncoding, &bounds);
- canvas->drawSimpleText(text, strlen(text), kUTF8_SkTextEncoding, -bounds.centerX(), -bounds.centerY(),
+ font.measureText(text, strlen(text), SkTextEncoding::kUTF8, &bounds);
+ canvas->drawSimpleText(text, strlen(text), SkTextEncoding::kUTF8, -bounds.centerX(), -bounds.centerY(),
font, paint);
}
diff --git a/samplecode/SampleLCD.cpp b/samplecode/SampleLCD.cpp
index 2245228..979dcb7 100644
--- a/samplecode/SampleLCD.cpp
+++ b/samplecode/SampleLCD.cpp
@@ -46,9 +46,9 @@
textSize += delta;
font.setEdging(SkFont::Edging::kAntiAlias);
- canvas->drawSimpleText(text, len, kUTF8_SkTextEncoding, x0, y, font, paint);
+ canvas->drawSimpleText(text, len, SkTextEncoding::kUTF8, x0, y, font, paint);
font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
- canvas->drawSimpleText(text, len, kUTF8_SkTextEncoding, x1, y, font, paint);
+ canvas->drawSimpleText(text, len, SkTextEncoding::kUTF8, x1, y, font, paint);
y += font.getSpacing();
}
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index c4e08bc..7026285 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp
@@ -509,7 +509,7 @@
paint.setStyle(SkPaint::kFill_Style);
SkFont font;
font.setSize(25.0f);
- SkTextUtils::Draw(canvas, &button.fLabel, 1, kUTF8_SkTextEncoding,
+ SkTextUtils::Draw(canvas, &button.fLabel, 1, SkTextEncoding::kUTF8,
button.fBounds.centerX(), button.fBounds.fBottom - 5,
font, paint, SkTextUtils::kCenter_Align);
}
@@ -682,7 +682,7 @@
path.reset();
SkFont font;
font.setSize(fTextSize);
- SkTextUtils::GetPath(fText.c_str(), fText.size(), kUTF8_SkTextEncoding,
+ SkTextUtils::GetPath(fText.c_str(), fText.size(), SkTextEncoding::kUTF8,
0, fTextSize, font, &path);
setForText();
draw_stroke(canvas, path, width * fWidthScale / fTextSize, fTextSize, true);
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index b0cf062..4bd601d 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -61,14 +61,14 @@
SkFontMetrics fm;
font.getMetrics(&fm);
- bounds.set(x, y + fm.fTop, x + font.measureText(text, len, kUTF8_SkTextEncoding), y + fm.fBottom);
+ bounds.set(x, y + fm.fTop, x + font.measureText(text, len, SkTextEncoding::kUTF8), y + fm.fBottom);
// may need to outset bounds a little, to account for hinting and/or
// antialiasing
bounds.inset(-SkIntToScalar(2), -SkIntToScalar(2));
canvas->saveLayer(&bounds, nullptr);
- canvas->drawSimpleText(text, len, kUTF8_SkTextEncoding, x, y, font, paint);
+ canvas->drawSimpleText(text, len, SkTextEncoding::kUTF8, x, y, font, paint);
const SkPoint pts[] = {
{ bounds.fLeft, y },
@@ -100,17 +100,18 @@
SkScalar x = 20;
SkScalar y = 20;
- canvas->drawSimpleText(str, len, kUTF8_SkTextEncoding, x, y, font, paint);
+ canvas->drawSimpleText(str, len, SkTextEncoding::kUTF8, x, y, font, paint);
y += 20;
- const SkPoint pts[] = { { x, y }, { x + font.measureText(str, len, kUTF8_SkTextEncoding), y } };
+ const SkPoint pts[] = { { x , y },
+ { x + font.measureText(str, len, SkTextEncoding::kUTF8), y } };
const SkColor colors[] = { SK_ColorBLACK, SK_ColorBLACK, 0 };
const SkScalar pos[] = { 0, 0.9f, 1 };
paint.setShader(SkGradientShader::MakeLinear(pts, colors, pos,
SK_ARRAY_COUNT(colors),
SkTileMode::kClamp));
- canvas->drawSimpleText(str, len, kUTF8_SkTextEncoding, x, y, font, paint);
+ canvas->drawSimpleText(str, len, SkTextEncoding::kUTF8, x, y, font, paint);
y += 20;
paint.setShader(nullptr);
@@ -189,7 +190,7 @@
paint.setColor(hilite ? SK_ColorRED : 0x40FF0000);
SkFont font;
font.setSize(SkIntToScalar(20));
- canvas->drawSimpleText(text, strlen(text), kUTF8_SkTextEncoding, loc.fX, loc.fY, font, paint);
+ canvas->drawSimpleText(text, strlen(text), SkTextEncoding::kUTF8, loc.fX, loc.fY, font, paint);
}
void drawPredicates(SkCanvas* canvas, const SkPoint pts[]) {
@@ -316,7 +317,7 @@
canvas->translate(0, SkIntToScalar(200));
for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); op++) {
- canvas->drawSimpleText(gOps[op].fName, strlen(gOps[op].fName), kUTF8_SkTextEncoding,
+ canvas->drawSimpleText(gOps[op].fName, strlen(gOps[op].fName), SkTextEncoding::kUTF8,
SkIntToScalar(75), SkIntToScalar(50), font, SkPaint());
this->drawRgnOped(canvas, gOps[op].fOp, gOps[op].fColor);
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index 4893936..a5b6453 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -135,7 +135,7 @@
SkStrokeRec rec(SkStrokeRec::kFill_InitStyle);
SkPath path, dstPath;
- SkTextUtils::GetPath(s.c_str(), s.size(), kUTF8_SkTextEncoding, x, y, font, &path);
+ SkTextUtils::GetPath(s.c_str(), s.size(), SkTextEncoding::kUTF8, x, y, font, &path);
pe->filterPath(&dstPath, path, &rec, nullptr);
SkPaint paint;