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/coloremoji.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gm/coloremoji.cpp') 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 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)); -- cgit v1.2.3