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>

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
index 0406496c51..47630d5c6b 100644
--- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
+++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -723,7 +723,7 @@ SkPoint SkShaper::shape(SkTextBlobBuilder* builder,
         ShapedGlyph* nextGlyph = glyphIterator.next();
 
         if (previousRunIndex != runIndex) {
-            SkPaint::FontMetrics metrics;
+            SkFontMetrics metrics;
             runs[runIndex].fPaint.getFontMetrics(&metrics);
             maxAscent = SkTMin(maxAscent, metrics.fAscent);
             maxDescent = SkTMax(maxDescent, metrics.fDescent);
diff --git a/modules/skshaper/src/SkShaper_primitive.cpp b/modules/skshaper/src/SkShaper_primitive.cpp
index e6b42771c0..3f45a11f0f 100644
--- a/modules/skshaper/src/SkShaper_primitive.cpp
+++ b/modules/skshaper/src/SkShaper_primitive.cpp
@@ -49,7 +49,7 @@ SkPoint SkShaper::shape(SkTextBlobBuilder* builder,
         return point;
     }
     SkRect bounds;
-    SkPaint::FontMetrics metrics;
+    SkFontMetrics metrics;
     paint.getFontMetrics(&metrics);
     point.fY -= metrics.fAscent;
     (void)paint.measureText(utf8text, textBytes, &bounds);