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 --- bench/TextBench.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'bench/TextBench.cpp') diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp index 39484a2e04..4ee0fd3d25 100644 --- a/bench/TextBench.cpp +++ b/bench/TextBench.cpp @@ -66,13 +66,7 @@ public: if (doColorEmoji) { SkASSERT(kBW == fFQ); - SkString filename = GetResourcePath("/Funkster.ttf"); - SkAutoTDelete stream(new SkFILEStream(filename.c_str())); - if (stream->isValid()) { - fColorEmojiTypeface.reset(SkTypeface::CreateFromStream(stream.detach())); - } else { - SkDebugf("Could not find Funkster.ttf, please set --resourcePath correctly.\n"); - } + fColorEmojiTypeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf")); } if (doPos) { -- cgit v1.2.3