Reland "Clean up Test's resourcePath code."

This relands commit 91359bed48bc006a4319da86eb26db3b2e6d4afb (Clean up
Test's resourcePath code."

BUG=None
TEST=make dm && out/Debug/dm
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/321723002

1 files changed, 11 insertions, 1 deletions

diff --git a/gm/gm.cpp b/gm/gm.cpp
index 803874f5bc..8da45c5fcb 100644
--- a/gm/gm.cpp
+++ b/gm/gm.cpp
@@ -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;