commit 89126e4550d2eb383f896c89a731c756b07d7b57
author Mike Reed <reed@google.com> Thu Jan 03 12:59:14 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 03 18:27:23 2019 +0000
tree e061c37946eed82a2b75a5437f7c28365e761984
parent c013ef665d02b5f920a18cc2337b6439f75fbeac

use drawSimpleText

Bug: skia:
Change-Id: I4aa6190e66478595a409f93a406fd42f19394302
Reviewed-on: https://skia-review.googlesource.com/c/180927
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

bench/MergeBench.cpp

diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index 10aa8b8..dd0e07c 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -7,6 +7,7 @@
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
+#include "SkFont.h"
 #include "SkImageSource.h"
 #include "SkMergeImageFilter.h"
 #include "SkSurface.h"
@@ -20,11 +21,10 @@
     sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(80, 80));
     surface->getCanvas()->clear(0x00000000);
     SkPaint paint;
-    paint.setAntiAlias(true);
     paint.setColor(0xFF884422);
-    paint.setTextSize(SkIntToScalar(96));
-    const char* str = "g";
-    surface->getCanvas()->drawString(str, 15, 55, paint);
+    SkFont font;
+    font.setSize(SkIntToScalar(96));
+    surface->getCanvas()->drawSimpleText("g", 1, kUTF8_SkTextEncoding, 15, 55, font, paint);
     return surface->makeImageSnapshot();
 }