From eb3f674d6ddd88e4a31570b26f61238b4b82f490 Mon Sep 17 00:00:00 2001
From: Herb Derby <herb@google.com>
Date: Mon, 5 Mar 2018 14:36:45 -0500
Subject: Add GetTypefaceOrDefault to SkPaintPriv

Remove most uses of GetDefaultTypeface. SkTypeface has
fewer friends.

BUG=skia:7515

Change-Id: Iedec5b39b9ef8c638772be4971075491b59b740b
Reviewed-on: https://skia-review.googlesource.com/112300
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
---
 src/svg/SkSVGDevice.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/svg')

diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index 6bb971d764..7206709e5c 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -17,6 +17,7 @@
 #include "SkDraw.h"
 #include "SkImageEncoder.h"
 #include "SkPaint.h"
+#include "SkPaintPriv.h"
 #include "SkParsePath.h"
 #include "SkShader.h"
 #include "SkStream.h"
@@ -544,7 +545,7 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) {
 
     SkString familyName;
     SkTHashSet<SkString> familySet;
-    sk_sp<SkTypeface> tface(paint.getTypeface() ? paint.refTypeface() : SkTypeface::MakeDefault());
+    sk_sp<SkTypeface> tface = SkPaintPriv::RefTypefaceOrDefault(paint);
 
     SkASSERT(tface);
     SkFontStyle style = tface->fontStyle();
-- 
cgit v1.2.3