Add getTypefaceOrDefault and refTypefaceOrDefault

* Remove GetTypefaceOrDefault from SkPaint and SkFont
* Remove RefTypefaceOrDefault from SkPaint and SkFont

Change-Id: I04ae777142c2bdec849508b611b844418bbaedff
Reviewed-on: https://skia-review.googlesource.com/c/185781
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index 6eb5bdec5e..115e5dd898 100644
--- a/gm/coloremoji.cpp
+++ b/gm/coloremoji.cpp
@@ -104,7 +104,7 @@ protected:
                 for (int makeGray = 0; makeGray < 2; makeGray++) {
                     for (int makeMode = 0; makeMode < 2; ++makeMode) {
                         for (int alpha = 0; alpha < 2; ++alpha) {
-                            SkFont shaderFont(font.refTypeface());
+                            SkFont shaderFont(font.refTypefaceOrDefault());
                             SkPaint shaderPaint;
                             if (SkToBool(makeLinear)) {
                                 shaderPaint.setShader(MakeLinear());
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index c9bf1e0735..f16af88249 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -251,7 +251,7 @@ public:
 
         SkGlyphID left = 0, right = 0, top = 0, bottom = 0;
         {
-            int numGlyphs = font.getTypeface()->countGlyphs();
+            int numGlyphs = font.getTypefaceOrDefault()->countGlyphs();
             SkRect min = {0, 0, 0, 0};
             for (int i = 0; i < numGlyphs; ++i) {
                 SkGlyphID glyphId = i;
@@ -277,7 +277,7 @@ public:
 
         if (FLAGS_veryVerbose) {
             SkString name;
-            font.getTypeface()->getFamilyName(&name);
+            font.getTypefaceOrDefault()->getFamilyName(&name);
             canvas->drawString(name, fontBounds.fLeft, fontBounds.fBottom, labelFont, SkPaint());
         }
         for (size_t i = 0; i < SK_ARRAY_COUNT(str); ++i) {
@@ -332,7 +332,7 @@ protected:
                 font.setTypeface(sk_sp<SkTypeface>(set->createTypeface(j)));
                 // Fonts with lots of glyphs are interesting, but can take a long time to find
                 // the glyphs which make up the maximum extent.
-                if (font.getTypeface() && font.getTypeface()->countGlyphs() < 1000) {
+                if (font.getTypefaceOrDefault() && font.getTypefaceOrDefault()->countGlyphs() < 1000) {
                     SkRect fontBounds = SkFontPriv::GetFontBounds(font);
                     x -= fontBounds.fLeft;
                     show_bounds(canvas, font, x, y, boundsColors[index & 1]);
diff --git a/gm/pdf_never_embed.cpp b/gm/pdf_never_embed.cpp
index 583ff3e1ed..dd69ea7f25 100644
--- a/gm/pdf_never_embed.cpp
+++ b/gm/pdf_never_embed.cpp
@@ -28,7 +28,7 @@ DEF_SIMPLE_GM(pdf_never_embed, canvas, 512, 512) {
     SkPaint p;
 
     SkFont font(MakeResourceAsTypeface("fonts/Roboto2-Regular_NoEmbed.ttf"), 60);
-    if (!font.getTypeface()) {
+    if (!font.getTypefaceOrDefault()) {
         return;
     }
 
diff --git a/gm/typeface.cpp b/gm/typeface.cpp
index bfe9371ae9..39d27fd2aa 100644
--- a/gm/typeface.cpp
+++ b/gm/typeface.cpp
@@ -32,7 +32,7 @@ static void getGlyphPositions(const SkFont& font, const uint16_t glyphs[],
 
 static void applyKerning(SkPoint pos[], const int32_t adjustments[], int count,
                          const SkFont& font) {
-    SkScalar scale = font.getSize() / font.getTypeface()->getUnitsPerEm();
+    SkScalar scale = font.getSize() / font.getTypefaceOrDefault()->getUnitsPerEm();
 
     SkScalar globalAdj = 0;
     for (int i = 0; i < count - 1; ++i) {
@@ -43,7 +43,7 @@ static void applyKerning(SkPoint pos[], const int32_t adjustments[], int count,
 
 static void drawKernText(SkCanvas* canvas, const void* text, size_t len,
                          SkScalar x, SkScalar y, const SkFont& font, const SkPaint& paint) {
-    SkTypeface* face = font.getTypeface();
+    SkTypeface* face = font.getTypefaceOrDefault();
     if (!face) {
         canvas->drawSimpleText(text, len, kUTF8_SkTextEncoding, x, y, font, paint);
         return;