commit 087fad7900d21ac938b7628051fcd48e2b4f538b
author Herb Derby <herb@google.com> Tue Jan 22 14:45:16 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 23 18:52:09 2019 +0000
tree 02f22f29711c8b2f3f77538994c9040c5409c9d3
parent 08b0b7fd5bd5c2b6ab746246167b1f0f446c9830

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>

src/utils/SkLua.cpp

diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index c755b61..8083e1e 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -951,7 +951,7 @@
 }
 
 static int lfont_getTypeface(lua_State* L) {
-    push_ref(L, get_obj<SkFont>(L, 1)->getTypeface());
+    push_ref(L, get_obj<SkFont>(L, 1)->getTypefaceOrDefault());
     return 1;
 }
 
@@ -966,7 +966,7 @@
 }
 
 static int lfont_getFontID(lua_State* L) {
-    SkTypeface* face = get_obj<SkFont>(L, 1)->getTypeface();
+    SkTypeface* face = get_obj<SkFont>(L, 1)->getTypefaceOrDefault();
     SkLua(L).pushU32(SkTypeface::UniqueID(face));
     return 1;
 }