Move resource fonts to common location.

Move resource fonts to resources/fonts, add a destortable font for
testing, and clean up how the tests create fonts from resources.

R=joshualitt@google.com

Review URL: https://codereview.chromium.org/1120823002

1 files changed, 2 insertions, 16 deletions

diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp
index 20b91accfd..fb1b632fb9 100644
--- a/gm/mixedtextblobs.cpp
+++ b/gm/mixedtextblobs.cpp
@@ -39,29 +39,15 @@ public:
 
 protected:
     void onOnceBeforeDraw() override {
-        SkAutoTDelete<SkFILEStream> stream;
-        SkString filename;
 #ifndef SK_BUILD_FOR_MAC
-        filename = GetResourcePath("/Funkster.ttf");
-        stream.reset(new SkFILEStream(filename.c_str()));
-        if (stream->isValid()) {
-            fEmojiTypeface.reset(SkTypeface::CreateFromStream(stream.detach()));
-        } else {
-            SkDebugf("Could not find Funkster.ttf, please set --resourcePath correctly.\n");
-        }
+        fEmojiTypeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf"));
         fEmojiText = "Emoji!!!";
 #else
         fEmojiTypeface.reset(SkTypeface::CreateFromName("Apple Color Emoji", SkTypeface::kNormal));
         fEmojiText = "\xF0\x9F\x92\xB0" "\xF0\x9F\x8F\xA1" "\xF0\x9F\x8E\x85" // 💰🏡🎅
                      "\xF0\x9F\x8D\xAA" "\xF0\x9F\x8D\x95" "\xF0\x9F\x9A\x80"; // 🍪🍕🚀
 #endif
-
-        filename = GetResourcePath("/ReallyBigA.ttf");
-
-        stream.reset(new SkFILEStream(filename.c_str()));
-        if (stream->isValid()) {
-            fReallyBigATypeface.reset(SkTypeface::CreateFromStream(stream.detach()));
-        }
+        fReallyBigATypeface.reset(GetResourceAsTypeface("/fonts/ReallyBigA.ttf"));
 
         SkTextBlobBuilder builder;