aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gm.cpp
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.cpp
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.cpp')
-rw-r--r--gm/gm.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/gm/gm.cpp b/gm/gm.cpp
index 8da45c5fcb..803874f5bc 100644
--- a/gm/gm.cpp
+++ b/gm/gm.cpp
@@ -6,10 +6,9 @@
*/
#include "gm.h"
-
using namespace skiagm;
-const char* GM::gResourcePath;
+SkString GM::gResourcePath;
GM::GM() {
fMode = kGM_Mode;
@@ -18,7 +17,6 @@ GM::GM() {
fHaveCalledOnceBeforeDraw = false;
fStarterMatrix.reset();
}
-
GM::~GM() {}
void GM::draw(SkCanvas* canvas) {
@@ -66,13 +64,5 @@ 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;