Old unnoticed changes (Paint->Font) for txt_benchmarks and making (#7068)

changes for removed SK_SUPPORT_LEGACY_TEXTENCODINGENUM

third_party/txt/benchmarks/paint_record_benchmarks.cc

@@ -28,14 +28,13 @@ static void BM_PaintRecordInit(benchmark::State& state) {
   TextStyle style;
   style.font_family = "Roboto";
 
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-  paint.setTextSize(14);
-  paint.setFakeBoldText(false);
+  SkFont font;
+  font.setEdging(SkFont::Edging::kAntiAlias);
+  font.setSize(14);
+  font.setEmbolden(false);
 
   SkTextBlobBuilder builder;
-  builder.allocRunPos(paint, 100);
+  builder.allocRunPos(font, 100);
   auto text_blob = builder.make();
 
   while (state.KeepRunning()) {

third_party/txt/benchmarks/paragraph_benchmarks.cc

@@ -426,15 +426,14 @@ BENCHMARK(BM_ParagraphMinikinAddStyleRun)
     ->Complexity(benchmark::oN);
 
 static void BM_ParagraphSkTextBlobAlloc(benchmark::State& state) {
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-  paint.setTextSize(14);
-  paint.setFakeBoldText(false);
+  SkFont font;
+  font.setEdging(SkFont::Edging::kAntiAlias);
+  font.setSize(14);
+  font.setEmbolden(false);
 
   while (state.KeepRunning()) {
     SkTextBlobBuilder builder;
-    builder.allocRunPos(paint, state.range(0));
+    builder.allocRunPos(font, state.range(0));
   }
   state.SetComplexityN(state.range(0));
 }

third_party/txt/src/txt/font_skia.cc

@@ -51,7 +51,7 @@ static void FontSkia_SetSkiaPaint(sk_sp<SkTypeface> typeface,
                                   SkPaint* skPaint,
                                   const minikin::MinikinPaint& paint) {
   skPaint->setTypeface(std::move(typeface));
-  skPaint->setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+  skPaint->setTextEncoding(kGlyphID_SkTextEncoding);
   // TODO: set more paint parameters from Minikin
   skPaint->setTextSize(paint.size);
 }