commit 21d456a55cbb0ac7ac55c9d6b7b7f7852275f8b4
author Zach Anderson <zra@google.com> Thu Jan 10 14:29:00 2019 -0800
committer Zach Anderson <zra@google.com> Thu Jan 10 23:08:14 2019 +0000
tree 69f6509056a23528c985d931acbc531b600ef708
parent 6c83dd3e8e15b57c430f1849637f92f1b7073343

[term] Fixes for skia roll

TEST=CQ
Change-Id: Ie74cd7a7a4c1fd037a6f2f5ea6a99b57a091e645

app/term/view_controller.cc

diff --git a/app/term/view_controller.cc b/app/term/view_controller.cc
index 843c663..9b9782d 100644
--- a/app/term/view_controller.cc
+++ b/app/term/view_controller.cc
@@ -149,10 +149,9 @@
   SkPaint bg_paint;
   bg_paint.setStyle(SkPaint::kFill_Style);
 
-  SkPaint fg_paint;
-  fg_paint.setTypeface(regular_typeface_);
-  fg_paint.setTextSize(params_.font_size);
-  fg_paint.setTextEncoding(SkTextEncoding::kUTF32);
+  SkFont fg_font;
+  fg_font.setTypeface(regular_typeface_);
+  fg_font.setSize(params_.font_size);
 
   TermModel::Size size = model_.GetSize();
   int y = 0;
@@ -178,13 +177,14 @@
             flags |= SkPaint::kFakeBoldText_Flag;
           // TODO(jpoichet): Account for TermModel::kAttributesUnderline
           // without using the deprecated flag SkPaint::kUnderlineText_Flag
+          SkPaint fg_paint;
           fg_paint.setFlags(flags);
           fg_paint.setColor(SkColorSetRGB(ch.foreground_color.red,
                                           ch.foreground_color.green,
                                           ch.foreground_color.blue));
 
-          canvas->drawText(&ch.code_point, sizeof(ch.code_point), x,
-                           y + ascent_, fg_paint);
+          canvas->drawSimpleText(&ch.code_point, sizeof(ch.code_point),
+              SkTextEncoding::kUTF32, x, y + ascent_, fg_font, fg_paint);
         }
       }
     }