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, 9 deletions

diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index 5a2703b4af..36897c52a8 100644
--- a/gm/coloremoji.cpp
+++ b/gm/coloremoji.cpp
@@ -54,15 +54,8 @@ protected:
         const char* text;
     } emojiFonts[2];
     virtual void onOnceBeforeDraw() override {
-        SkString filename = GetResourcePath("/Funkster.ttf");
-        SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str()));
-        if (stream->isValid()) {
-            fCBDT_CBLC_Typeface.reset(SkTypeface::CreateFromStream(stream.detach()));
-            emojiFonts[0].typeface = fCBDT_CBLC_Typeface;
-        } else {
-            SkDebugf("Could not find Funkster.ttf, please set --resourcePath correctly.\n");
-            emojiFonts[0].typeface = NULL;
-        }
+        fCBDT_CBLC_Typeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf"));
+        emojiFonts[0].typeface = fCBDT_CBLC_Typeface;
         emojiFonts[0].text = "hamburgerfons";
 
         fSBIX_Typeface.reset(SkTypeface::CreateFromName("Apple Color Emoji", SkTypeface::kNormal));