Reland "Clean up Test's resourcePath code."

bench/SkBenchmark.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkBenchmark_DEFINED
 #define SkBenchmark_DEFINED
 
@@ skipping 89 matching lines @@
      *      uint32_t flags = paint.getFlags();
      *      flags &= ~clearMask;
      *      flags |= orMask;
      *      paint.setFlags(flags);
      */
     void setPaintMasks(uint32_t orMask, uint32_t clearMask) {
         fOrMask = orMask;
         fClearMask = clearMask;
     }
 
-    static void SetResourcePath(const char* resPath) { gResourcePath.set(resPath); }
-
-    static SkString& GetResourcePath() { return gResourcePath; }
+    static void SetResourcePath(const char*);
+    static SkString GetResourcePath();
 
 protected:
     virtual void setupPaint(SkPaint* paint);
 
     virtual const char* onGetName() = 0;
     virtual void onPreDraw() {}
     // Each bench should do its main work in a loop like this:
     //   for (int i = 0; i < loops; i++) { <work here> }
     virtual void onDraw(const int loops, SkCanvas*) = 0;
     virtual void onPostDraw() {}
 
     virtual SkIPoint onGetSize();
 
 private:
     int     fForceAlpha;
     bool    fForceAA;
     bool    fForceFilter;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
-    static  SkString gResourcePath;
+    static const char* gResourcePath;
 
     typedef SkRefCnt INHERITED;
 };
 
 typedef SkTRegistry<SkBenchmark*(*)(void*)> BenchRegistry;
 
 #endif