Remove variants of ParagraphBuilder::AddText that are not used within the engine (#9403)

third_party/txt/benchmarks/paragraph_builder_benchmarks.cc

@@ -63,7 +63,7 @@ static void BM_ParagraphBuilderPushPop(benchmark::State& state) {
 BENCHMARK(BM_ParagraphBuilderPushPop);
 
 static void BM_ParagraphBuilderAddTextString(benchmark::State& state) {
-  std::string text = "Hello World";
+  std::u16string text = u"Hello World";
 
   auto font_collection = GetTestFontCollection();
 
@@ -77,7 +77,7 @@ static void BM_ParagraphBuilderAddTextString(benchmark::State& state) {
 BENCHMARK(BM_ParagraphBuilderAddTextString);
 
 static void BM_ParagraphBuilderAddTextChar(benchmark::State& state) {
-  const char* text = "Hello World";
+  std::u16string text = u"Hello World";
 
   txt::ParagraphStyle paragraph_style;
   auto font_collection = GetTestFontCollection();

third_party/txt/src/txt/paragraph_builder.cc

@@ -63,20 +63,6 @@ void ParagraphBuilder::AddText(const std::u16string& text) {
   text_.insert(text_.end(), text.begin(), text.end());
 }
 
-void ParagraphBuilder::AddText(const std::string& text) {
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-  AddText(u16_text);
-}
-
-void ParagraphBuilder::AddText(const char* text) {
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-  AddText(u16_text);
-}
-
 void ParagraphBuilder::AddPlaceholder(PlaceholderRun& span) {
   obj_replacement_char_indexes_.insert(text_.size());
   runs_.StartRun(PeekStyleIndex(), text_.size());

third_party/txt/src/txt/paragraph_builder.h

@@ -61,12 +61,6 @@ class ParagraphBuilder {
   // on the style_stack_;
   void AddText(const std::u16string& text);
 
-  // Converts to u16string before adding.
-  void AddText(const std::string& text);
-
-  // Converts to u16string before adding.
-  void AddText(const char* text);
-
   // Pushes the information requried to leave an open space, where Flutter may
   // draw a custom placeholder into.
   //

third_party/txt/tests/paragraph_unittests.cc

@@ -1825,31 +1825,31 @@ TEST_F(ParagraphTest, DecorationsParagraph) {
   text_style.decoration_color = SK_ColorBLACK;
   text_style.decoration_thickness_multiplier = 2.0;
   builder.PushStyle(text_style);
-  builder.AddText("This text should be");
+  builder.AddText(u"This text should be");
 
   text_style.decoration_style = txt::TextDecorationStyle::kDouble;
   text_style.decoration_color = SK_ColorBLUE;
   text_style.decoration_thickness_multiplier = 1.0;
   builder.PushStyle(text_style);
-  builder.AddText(" decorated even when");
+  builder.AddText(u" decorated even when");
 
   text_style.decoration_style = txt::TextDecorationStyle::kDotted;
   text_style.decoration_color = SK_ColorBLACK;
   builder.PushStyle(text_style);
-  builder.AddText(" wrapped around to");
+  builder.AddText(u" wrapped around to");
 
   text_style.decoration_style = txt::TextDecorationStyle::kDashed;
   text_style.decoration_color = SK_ColorBLACK;
   text_style.decoration_thickness_multiplier = 3.0;
   builder.PushStyle(text_style);
-  builder.AddText(" the next line.");
+  builder.AddText(u" the next line.");
 
   text_style.decoration_style = txt::TextDecorationStyle::kWavy;
   text_style.decoration_color = SK_ColorRED;
   text_style.decoration_thickness_multiplier = 1.0;
   builder.PushStyle(text_style);
 
-  builder.AddText(" Otherwise, bad things happen.");
+  builder.AddText(u" Otherwise, bad things happen.");
 
   builder.Pop();
 
@@ -1911,14 +1911,14 @@ TEST_F(ParagraphTest, ItalicsParagraph) {
   text_style.color = SK_ColorRED;
   text_style.font_size = 10;
   builder.PushStyle(text_style);
-  builder.AddText("No italic ");
+  builder.AddText(u"No italic ");
 
   text_style.font_style = txt::FontStyle::italic;
   builder.PushStyle(text_style);
-  builder.AddText("Yes Italic ");
+  builder.AddText(u"Yes Italic ");
 
   builder.Pop();
-  builder.AddText("No Italic again.");
+  builder.AddText(u"No Italic again.");
 
   auto paragraph = builder.Build();
   paragraph->Layout(GetTestCanvasWidth());
@@ -3493,28 +3493,28 @@ TEST_F(ParagraphTest, SpacingParagraph) {
   text_style.letter_spacing = 0;
   text_style.word_spacing = 0;
   builder.PushStyle(text_style);
-  builder.AddText("|");
+  builder.AddText(u"|");
   builder.Pop();
 
   text_style.font_size = 50;
   text_style.letter_spacing = 0;
   text_style.word_spacing = 20;
   builder.PushStyle(text_style);
-  builder.AddText("H ");
+  builder.AddText(u"H ");
   builder.Pop();
 
   text_style.font_size = 50;
   text_style.letter_spacing = 0;
   text_style.word_spacing = 0;
   builder.PushStyle(text_style);
-  builder.AddText("H ");
+  builder.AddText(u"H ");
   builder.Pop();
 
   text_style.font_size = 50;
   text_style.letter_spacing = 0;
   text_style.word_spacing = 20;
   builder.PushStyle(text_style);
-  builder.AddText("H ");
+  builder.AddText(u"H ");
   builder.Pop();
 
   auto paragraph = builder.Build();
@@ -3598,16 +3598,16 @@ TEST_F(ParagraphTest, KernScaleParagraph) {
   text_style.color = SK_ColorBLACK;
   text_style.height = 1;
   builder.PushStyle(text_style);
-  builder.AddText("AVAVAWAH A0 V0 VA To The Lo");
+  builder.AddText(u"AVAVAWAH A0 V0 VA To The Lo");
   builder.PushStyle(text_style);
-  builder.AddText("A");
+  builder.AddText(u"A");
   builder.PushStyle(text_style);
-  builder.AddText("V");
+  builder.AddText(u"V");
   text_style.font_size = 14 / scale;
   builder.PushStyle(text_style);
   builder.AddText(
-      " Dialog Text List lots of words to see if kerning works on a bigger set "
-      "of characters AVAVAW");
+      u" Dialog Text List lots of words to see if kerning works on a bigger "
+      u"set of characters AVAVAW");
 
   builder.Pop();
 
@@ -3641,7 +3641,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(NewlineParagraph)) {
   text_style.height = 1;
   builder.PushStyle(text_style);
   builder.AddText(
-      "line1\nline2 test1 test2 test3 test4 test5 test6 test7\nline3\n\nline4 "
+      u"line1\nline2 test1 test2 test3 test4 test5 test6 test7\nline3\n\nline4 "
       "test1 test2 test3 test4");
 
   builder.Pop();