diff options
| author |  bungeman <bungeman@google.com> | 2015-04-30 17:12:58 -0400 |
|---|---|---|
| committer | bungeman <bungeman@google.com> | 2015-04-30 17:12:58 -0400 |
| commit | 3ffa126066542590dc7430514a1174e49191b875 (patch) | |
| tree | be4f38159a515b02340ae6c24a7c253513b52177 /bench/TextBench.cpp | |
| parent | a09c0461463a5976908af5232b755e1663b972bf (diff) | |
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
Diffstat (limited to 'bench/TextBench.cpp')
| -rw-r--r-- | bench/TextBench.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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<SkFILEStream> 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) { |