Clean up Test's resourcePath code.

tests/Test.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 skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 44 matching lines @@
         Reporter* getReporter() const { return fReporter; }
         void setReporter(Reporter*);
 
         const char* getName();
         void run();
         bool passed() const { return fPassed; }
         SkMSec elapsedMs() const { return fElapsed; }
 
         static SkString GetTmpDir();
 
-        static void SetResourcePath(const char*);
-        static SkString GetResourcePath();
+        static void SetResourcePath(const char* resourcePath) {

[mtklein, 2014/06/05 12:55:33]

I wouldn't bother with the churn?  There's not going to be any benefit to
inlining these: SetResourcePath is called once, and GetResourcePath maybe 10
times?  This is a minor feature and it's nice to get it isolated and out of the
way in its own ignorable corner of the .cc file as much as possible.  We have to
pay 2 lines in here for SetResourcePath and GetResourcePath, and I'm happy to
pay a third for the extra clarity of scoping gResourcePath under Test, but I'd
like to stop there.

[tfarina, 2014/06/06 01:53:10]

Done.

+            gResourcePath = resourcePath;
+        }
+        static SkString& GetResourcePath() { return gResourcePath; }

[mtklein, 2014/06/05 12:55:33]

SkString is fine to return by value, especially here in a part of the code that
doesn't matter performance-wise.  I don't mind returning a const SkString&, but
it's inconsistent with GetTmpDir, and also forces us to be storing an SkString.

[tfarina, 2014/06/06 01:53:10]

Done.

 
         virtual bool isGPUTest() const { return false; }
         virtual void setGrContextFactory(GrContextFactory* factory) {}
 
     protected:
         virtual void onGetName(SkString*) = 0;
         virtual void onRun(Reporter*) = 0;
 
     private:
+        static SkString gResourcePath;

[mtklein, 2014/06/05 12:55:33]

Let's turn this back into a static const char*.  It's generally a good habit to
keep globals POD unless we're being particularly careful about their lifetimes.

[tfarina, 2014/06/06 01:53:10]

Done.

+
         Reporter*   fReporter;
         SkString    fName;
         bool        fPassed;
         SkMSec      fElapsed;
     };
 
     class GpuTest : public Test{
     public:
         GpuTest() : Test(), fGrContextFactory(NULL) {}
 
@@ skipping 83 matching lines @@
         }                                                          \
         virtual void onRun(Reporter* r) SK_OVERRIDE {              \
             name(r, fGrContextFactory);                            \
         }                                                          \
     };                                                             \
     static TestRegistry gReg_##name##Class(name##Class::Factory);  \
     }                                                              \
     static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
 
 #endif