SkGlyphCache_Globals: SkMutex -> SkSpinlock

src/core/SkGlyphCache_Globals.h

Index: src/core/SkGlyphCache_Globals.h
diff --git a/src/core/SkGlyphCache_Globals.h b/src/core/SkGlyphCache_Globals.h
index 4bd607c598037e39b4e992e75473d4ffdd74750c..373465d551198612b8ef5bdf9836918ef30afaed 100644
--- a/src/core/SkGlyphCache_Globals.h
+++ b/src/core/SkGlyphCache_Globals.h
@@ -9,6 +9,7 @@
 #define SkGlyphCache_Globals_DEFINED
 
 #include "SkGlyphCache.h"
+#include "SkSpinlock.h"
 #include "SkTLS.h"
 
 #ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT
@@ -22,9 +23,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkMutex;
+class SkSpinlock;
 
 class SkGlyphCache_Globals {
 public:
+    using Lock = SkSpinlock;
     enum UseMutex {
         kNo_UseMutex,  // thread-local cache
         kYes_UseMutex  // shared cache
@@ -37,7 +40,7 @@ public:
         fCacheCount = 0;
         fCacheCountLimit = SK_DEFAULT_FONT_CACHE_COUNT_LIMIT;
 
-        fMutex = (kYes_UseMutex == um) ? SkNEW(SkMutex) : NULL;
+        fMutex = (kYes_UseMutex == um) ? SkNEW(SkSpinlock) : NULL;

[mtklein, 2015/07/08 19:33:47]

Lock?

[herb_g, 2015/07/08 20:21:57]

Ok. I have obviously botched the way TLS is being handled. Can I remove the TLS
code path from this to simplify the problem? 

     }
 
     ~SkGlyphCache_Globals() {
@@ -51,7 +54,7 @@ public:
         SkDELETE(fMutex);
     }
 
-    SkMutex*        fMutex;
+    Lock*        fMutex;
 
     SkGlyphCache* internalGetHead() const { return fHead; }
     SkGlyphCache* internalGetTail() const;