add counting to Globals, and refactor some for clarity

BUG=

Review URL: https://codereview.chromium.org/24447003

git-svn-id: http://skia.googlecode.com/svn/trunk@11484 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 01e5243..d15c065 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -101,6 +101,7 @@
         '<(skia_src_path)/core/SkGeometry.cpp',
         '<(skia_src_path)/core/SkGlyphCache.cpp',
         '<(skia_src_path)/core/SkGlyphCache.h',
+        '<(skia_src_path)/core/SkGlyphCache_Globals.h',
         '<(skia_src_path)/core/SkGraphics.cpp',
         '<(skia_src_path)/core/SkInstCnt.cpp',
         '<(skia_src_path)/core/SkImageFilter.cpp',