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.h | |
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.h')
-rw-r--r-- | gm/gm.h | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -96,13 +96,8 @@ namespace skiagm { // GM's getISize bounds. void drawSizeBounds(SkCanvas*, SkColor); - static void SetResourcePath(const char* resourcePath) { - gResourcePath = resourcePath; - } - - static SkString& GetResourcePath() { - return gResourcePath; - } + static void SetResourcePath(const char*); + static SkString GetResourcePath(); bool isCanvasDeferred() const { return fCanvasIsDeferred; } void setCanvasIsDeferred(bool isDeferred) { @@ -115,7 +110,7 @@ namespace skiagm { } protected: - static SkString gResourcePath; + static const char* gResourcePath; virtual void onOnceBeforeDraw() {} virtual void onDraw(SkCanvas*) = 0; |