commit b5784ace850ddffb6327827a44363ed13195bd31
author Mike Reed <reed@google.com> Mon Nov 12 09:35:15 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 12 15:03:03 2018 +0000
tree 377fd76244bda051c7954fd26bd27875b7ff3a91
parent e5178243d0cb851473616b129ecfea25ca76c394

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>

samplecode/SampleChineseFling.cpp

diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index 2a25998..769cc1e 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -121,7 +121,7 @@
 
     bool                        fInitialized = false;
     sk_sp<SkTypeface>           fTypeface;
-    SkPaint::FontMetrics        fMetrics;
+    SkFontMetrics               fMetrics;
     SkTArray<sk_sp<SkTextBlob>> fBlobs;
     SkRandom                    fRand;
     int                         fIndex;
@@ -253,7 +253,7 @@
 
     bool                        fInitialized = false;
     sk_sp<SkTypeface>           fTypeface;
-    SkPaint::FontMetrics        fMetrics;
+    SkFontMetrics               fMetrics;
     SkTArray<sk_sp<SkTextBlob>> fBlobs;
     SkRandom                    fRand;
     SkScalar                    fScale;