diff options
| author |  tfarina <tfarina@chromium.org> | 2014-06-18 14:32:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-18 14:32:49 -0700 |
| commit | bcbc1788b478b1e54079318ad073e8490aa66fae (patch) | |
| tree | 5492557ad07a5917364b69721788bc5ec471954a /gm/coloremoji.cpp | |
| parent | 6518eaaefac27a823c55c16c12b3c698f09aabf5 (diff) | |
Refactor how we handle resources path in Tests.
This idea emerged while doing https://codereview.chromium.org/321723002/
(commit 880914c35c8f7fc2e9c57134134c883baf66e538).
BUG=None
TEST=make tests && out/Debug/tests
R=mtklein@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/346453002
Diffstat (limited to 'gm/coloremoji.cpp')
| -rw-r--r-- | gm/coloremoji.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 39c70bd707..cf4500819a 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -6,6 +6,8 @@ */ #include "gm.h" + +#include "Resources.h" #include "SkCanvas.h" #include "SkStream.h" #include "SkTypeface.h" @@ -27,8 +29,7 @@ protected: } virtual void onOnceBeforeDraw() SK_OVERRIDE { - - SkString filename(INHERITED::gResourcePath); + SkString filename = GetResourcePath(); filename.append("/Funkster.ttf"); SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str())); |