Index: gm/gm.cpp |
diff --git a/gm/gm.cpp b/gm/gm.cpp |
index 8da45c5fcb165903ca4d1a10dba756eba5ec6ca2..803874f5bc9d193c9c46a247f68397a5ba721e17 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 @@ |
fHaveCalledOnceBeforeDraw = false; |
fStarterMatrix.reset(); |
} |
- |
GM::~GM() {} |
void GM::draw(SkCanvas* canvas) { |
@@ -66,13 +64,5 @@ |
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; |