aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gm.cpp
diff options
context:
space:
mode:
authorGravatar tfarina <tfarina@chromium.org>2014-06-18 14:32:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-18 14:32:49 -0700
commitbcbc1788b478b1e54079318ad073e8490aa66fae (patch)
tree5492557ad07a5917364b69721788bc5ec471954a /gm/gm.cpp
parent6518eaaefac27a823c55c16c12b3c698f09aabf5 (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/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..57c5c5ded6 100644
--- a/gm/gm.cpp
+++ b/gm/gm.cpp
@@ -9,8 +9,6 @@
using namespace skiagm;
-const char* GM::gResourcePath;
-
GM::GM() {
fMode = kGM_Mode;
fBGColor = SK_ColorWHITE;
@@ -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;
+template GMRegistry* GMRegistry::gHead;