From eb3f674d6ddd88e4a31570b26f61238b4b82f490 Mon Sep 17 00:00:00 2001 From: Herb Derby 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 Commit-Queue: Herb Derby --- tests/FontHostStreamTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/FontHostStreamTest.cpp') diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp index e97ea0dcc2..3a5f52895f 100644 --- a/tests/FontHostStreamTest.cpp +++ b/tests/FontHostStreamTest.cpp @@ -11,6 +11,7 @@ #include "SkFontDescriptor.h" #include "SkGraphics.h" #include "SkPaint.h" +#include "SkPaintPriv.h" #include "SkPoint.h" #include "SkRect.h" #include "SkStream.h" @@ -84,8 +85,7 @@ DEF_TEST(FontHostStream, reporter) { drawBG(&origCanvas); origCanvas.drawString("A", point.fX, point.fY, paint); - sk_sp typeface(paint.getTypeface() ? paint.refTypeface() - : SkTypeface::MakeDefault()); + sk_sp typeface = SkPaintPriv::RefTypefaceOrDefault(paint); int ttcIndex; std::unique_ptr fontData(typeface->openStream(&ttcIndex)); if (!fontData) { -- cgit v1.2.3