aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gm.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2014-06-08 07:02:47 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-08 07:02:47 -0700
commit91359bed48bc006a4319da86eb26db3b2e6d4afb (patch)
tree923d1ac57009191855db0b4a49b487d9bf39a283 /gm/gm.h
parent643b8bd6617e333f7a970a57ad9166f3d6675d1a (diff)
Revert of Clean up Test's resourcePath code. (https://codereview.chromium.org/319473003/)
Reason for revert: Some benchmarks are written in a way that makes this change unsafe (e.g. const char* resPath = GetResourcePath().c_str(); in SkipZeroesBench) and Valgrind and ASAN caught that. We can try again after a more careful cleanup of GetResourcePath(). Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/52e4f413ffe2d281f9e90ff2147db08083ffcba7 R=tfarina@chromium.org TBR=tfarina@chromium.org NOTREECHECKS=true NOTRY=true BUG=None Author: mtklein@google.com Review URL: https://codereview.chromium.org/320733002
Diffstat (limited to 'gm/gm.h')
-rw-r--r--gm/gm.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/gm/gm.h b/gm/gm.h
index a48976b20e..90de96f7e8 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -96,8 +96,13 @@ namespace skiagm {
// GM's getISize bounds.
void drawSizeBounds(SkCanvas*, SkColor);
- static void SetResourcePath(const char*);
- static SkString GetResourcePath();
+ static void SetResourcePath(const char* resourcePath) {
+ gResourcePath = resourcePath;
+ }
+
+ static SkString& GetResourcePath() {
+ return gResourcePath;
+ }
bool isCanvasDeferred() const { return fCanvasIsDeferred; }
void setCanvasIsDeferred(bool isDeferred) {
@@ -110,7 +115,7 @@ namespace skiagm {
}
protected:
- static const char* gResourcePath;
+ static SkString gResourcePath;
virtual void onOnceBeforeDraw() {}
virtual void onDraw(SkCanvas*) = 0;