From 9a9a7b29e5e5916a7b6453cd124ca437f14b9da4 Mon Sep 17 00:00:00 2001 From: scroggo Date: Thu, 12 May 2016 06:22:30 -0700 Subject: Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ ) Reason for revert: fontmgr_iterAndroid failing to draw emoji. E.g. https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm Original issue's description: > Move SkTypeface to sk_sp. > > Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f TBR=reed@google.com,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/1974783002 --- tools/Resources.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/Resources.h') diff --git a/tools/Resources.h b/tools/Resources.h index 8115fbbb85..678e4c8627 100644 --- a/tools/Resources.h +++ b/tools/Resources.h @@ -22,6 +22,6 @@ void SetResourcePath(const char* ); bool GetResourceAsBitmap(const char* resource, SkBitmap* dst); sk_sp GetResourceAsImage(const char* resource); SkStreamAsset* GetResourceAsStream(const char* resource); -sk_sp MakeResourceAsTypeface(const char* resource); +SkTypeface* GetResourceAsTypeface(const char* resource); #endif // Resources_DEFINED -- cgit v1.2.3