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, 1 insertions, 8 deletions

diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index 314ee71389..63e7cdfa5e 100755
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -24,14 +24,7 @@ public:
 
 protected:
     void onOnceBeforeDraw() override {
-        SkString filename = GetResourcePath("/Funkster.ttf");
-        SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str()));
-        if (!stream->isValid()) {
-            SkDebugf("Could not find Funkster.ttf, please set --resourcePath correctly.\n");
-            return;
-        }
-
-        fTypeface = SkTypeface::CreateFromStream(stream.detach());
+        fTypeface = GetResourceAsTypeface("/fonts/Funkster.ttf");
     }
 
     SkString onShortName() override {