aboutsummaryrefslogtreecommitdiffstats
path: root/samplecode/SampleFontCache.cpp
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2018-11-12 09:35:15 -0500
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-11-12 15:03:03 +0000
commitb5784ace850ddffb6327827a44363ed13195bd31 (patch)
tree377fd76244bda051c7954fd26bd27875b7ff3a91 /samplecode/SampleFontCache.cpp
parente5178243d0cb851473616b129ecfea25ca76c394 (diff)
downloadplatform_external_skqp-b5784ace850ddffb6327827a44363ed13195bd31.tar.gz
platform_external_skqp-b5784ace850ddffb6327827a44363ed13195bd31.tar.bz2
platform_external_skqp-b5784ace850ddffb6327827a44363ed13195bd31.zip
use SkFontMetrics so we can deprecated the typedef
Bug: skia: Change-Id: Icd40c042b0a8251bbd0b39dd3ee1a4634fff379f Reviewed-on: https://skia-review.googlesource.com/c/170344 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'samplecode/SampleFontCache.cpp')
-rw-r--r--samplecode/SampleFontCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleFontCache.cpp b/samplecode/SampleFontCache.cpp
index 2428657758..2ba4b08381 100644
--- a/samplecode/SampleFontCache.cpp
+++ b/samplecode/SampleFontCache.cpp
@@ -22,7 +22,7 @@ static void call_measure() {
text[j] = (uint16_t)((rand.nextU() & 0xFF) + 32);
for (int i = 9; i < 36; i++) {
- SkPaint::FontMetrics m;
+ SkFontMetrics m;
paint.setTextSize(SkIntToScalar(i));
paint.getFontMetrics(&m);
@@ -46,7 +46,7 @@ static void call_draw(SkCanvas* canvas) {
canvas->drawColor(SK_ColorWHITE);
for (int i = 9; i < 36; i++)
{
- SkPaint::FontMetrics m;
+ SkFontMetrics m;
paint.setTextSize(SkIntToScalar(i));
paint.getFontMetrics(&m);