Have GMs read the GrContext via a setter/getter rather than a global.

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 1460 matching lines @@
  * Sets the global GrContext, accessible by individual GMs
  */
 static void SetGr(GrContext* grContext) {
     SkSafeRef(grContext);
     gGrContext.reset(grContext);
 }
 
 /**
  * Gets the global GrContext, can be called by GM tests.
  */
-GrContext* GetGr();
-GrContext* GetGr() {
+static GrContext* GetGr() {
     return gGrContext.get();
 }
 
 /**
  * Sets the global GrContext and then resets it to its previous value at
  * destruction.
  */
 class AutoResetGr : SkNoncopyable {
 public:
     AutoResetGr() : fOld(NULL) {}
     void set(GrContext* context) {
         SkASSERT(NULL == fOld);
         fOld = GetGr();
         SkSafeRef(fOld);
         SetGr(context);
     }
     ~AutoResetGr() { SetGr(fOld); SkSafeUnref(fOld); }
 private:
     GrContext* fOld;
 };
-#else
-GrContext* GetGr();
-GrContext* GetGr() { return NULL; }
 #endif
 }
 
 template <typename T> void appendUnique(SkTDArray<T>* array, const T& value) {
     int index = array->find(value);
     if (index < 0) {
         *array->append() = value;
     }
 }
 
@@ skipping 66 matching lines @@
                 GrTextureDesc desc;
                 desc.fConfig = kSkia8888_GrPixelConfig;
                 desc.fFlags = kRenderTarget_GrTextureFlagBit;
                 desc.fWidth = gm->getISize().width();
                 desc.fHeight = gm->getISize().height();
                 desc.fSampleCnt = config.fSampleCnt;
                 auGpuTarget.reset(gr->createUncachedTexture(desc, NULL, 0));
                 if (NULL != auGpuTarget) {
                     gpuTarget = auGpuTarget;
                     grSuccess = true;
                     autogr.set(gr);

[robertphillips, 2013/09/16 18:13:38]

Why not just "gr"?

[mtklein, 2013/09/16 18:17:43]

No good reason.  Got rid of GetGr() entirely.

+                    gm->setGr(GetGr());
                     // Set the user specified cache limits if non-default.
                     size_t bytes;
                     int count;
                     gr->getTextureCacheLimits(&count, &bytes);
                     if (DEFAULT_CACHE_VALUE != gGpuCacheSizeBytes) {
                         bytes = static_cast<size_t>(gGpuCacheSizeBytes);
                     }
                     if (DEFAULT_CACHE_VALUE != gGpuCacheSizeCount) {
                         count = gGpuCacheSizeCount;
                     }
@@ skipping 687 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif