Add guards around access to font cache global fields.

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 e1825a2f0f90d935a8c5d90637c373d293b07d2b..4d7fe22d807dcd2dc8b12ce55acae983cd1ef522 100644
--- a/src/core/SkGlyphCache_Globals.h
+++ b/src/core/SkGlyphCache_Globals.h
@@ -42,13 +42,13 @@ public:
         }
     }
 
-    SkSpinlock     fLock;
+    mutable SkSpinlock     fLock;

[reed1, 2016/06/22 16:05:36]

make private?

 
     SkGlyphCache* internalGetHead() const { return fHead; }
     SkGlyphCache* internalGetTail() const;
 
-    size_t getTotalMemoryUsed() const { return fTotalMemoryUsed; }
-    int getCacheCountUsed() const { return fCacheCount; }
+    size_t getTotalMemoryUsed() const;
+    int getCacheCountUsed() const;
 
 #ifdef SK_DEBUG
     void validate() const;
@@ -56,19 +56,12 @@ public:
     void validate() const {}
 #endif
 
-    int getCacheCountLimit() const { return fCacheCountLimit; }
+    int getCacheCountLimit() const;
     int setCacheCountLimit(int limit);
 
-    size_t  getCacheSizeLimit() const { return fCacheSizeLimit; }
+    size_t  getCacheSizeLimit() const;
     size_t  setCacheSizeLimit(size_t limit);
 
-    // returns true if this cache is over-budget either due to size limit
-    // or count limit.
-    bool isOverBudget() const {
-        return fCacheCount > fCacheCountLimit ||
-               fTotalMemoryUsed > fCacheSizeLimit;
-    }
-
     void purgeAll(); // does not change budget
 
     // call when a glyphcache is available for caching (i.e. not in use)