From 3ffa126066542590dc7430514a1174e49191b875 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 30 Apr 2015 17:12:58 -0400 Subject: 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 --- gm/dftext.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gm/dftext.cpp') 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 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 { -- cgit v1.2.3