diff options
author | tfarina <tfarina@chromium.org> | 2014-06-07 20:50:44 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-06-07 20:50:44 -0700 |
commit | 52e4f413ffe2d281f9e90ff2147db08083ffcba7 (patch) | |
tree | e634f5fa3e03aa48bdb9cdd7a3399b7aca967765 /gm/gm.cpp | |
parent | 3d06b48660e389a4e4c060ac8b6b0ba49363c853 (diff) |
Clean up resourcePath code.
1) Make the implementation of SetResourcePath/GetResourcePath of GM and SkBenchmark match with the one in Test.
2) Make gResourcePath a static pointer to const char and move it inside the classes.
BUG=None
TEST=make tests && out/Debug/tests
make gm && out/Debug/gm
make bench && out/Debug/bench
R=mtklein@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/319473003
Diffstat (limited to 'gm/gm.cpp')
-rw-r--r-- | gm/gm.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -6,9 +6,10 @@ */ #include "gm.h" + using namespace skiagm; -SkString GM::gResourcePath; +const char* GM::gResourcePath; GM::GM() { fMode = kGM_Mode; @@ -17,6 +18,7 @@ GM::GM() { fHaveCalledOnceBeforeDraw = false; fStarterMatrix.reset(); } + GM::~GM() {} void GM::draw(SkCanvas* canvas) { @@ -64,5 +66,13 @@ void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) { canvas->drawRect(r, paint); } +void GM::SetResourcePath(const char* resourcePath) { + gResourcePath = resourcePath; +} + +SkString GM::GetResourcePath() { + return SkString(gResourcePath); +} + // need to explicitly declare this, or we get some weird infinite loop llist template GMRegistry* SkTRegistry<GM*(*)(void*)>::gHead; |