From 3a7b45135a5e2b995eb5b91cd2faa22611152f07 Mon Sep 17 00:00:00 2001 From: Rusino Date: Mon, 3 Dec 2018 17:00:37 -0500 Subject: [PATCH] Old unnoticed changes (Paint->Font) for txt_benchmarks and making (flutter/engine#7068) changes for removed SK_SUPPORT_LEGACY_TEXTENCODINGENUM --- .../txt/benchmarks/paint_record_benchmarks.cc | 11 +++++------ .../txt/benchmarks/paragraph_benchmarks.cc | 11 +++++------ .../src/flutter/third_party/txt/src/txt/font_skia.cc | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc index 1b6cf98d48..b2adf0d346 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc +++ b/engine/src/flutter/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()) { diff --git a/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc index d3236847bf..b19783b169 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc +++ b/engine/src/flutter/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)); } diff --git a/engine/src/flutter/third_party/txt/src/txt/font_skia.cc b/engine/src/flutter/third_party/txt/src/txt/font_skia.cc index 5290bdbe42..bca78fd18b 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_skia.cc +++ b/engine/src/flutter/third_party/txt/src/txt/font_skia.cc @@ -51,7 +51,7 @@ static void FontSkia_SetSkiaPaint(sk_sp 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); }