move failable work outside of constructors for SkGlyphCache and SkScalerContextGDI. If we fail, try…

src/core/SkGlyphCache.h

Index: src/core/SkGlyphCache.h
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 6011eb91732aa602d487df9b5ca38e8f65e55135..3da7a2252f3cc7e313838d4d5ec42e3e9917943f 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -185,7 +185,8 @@ public:
     };
 
 private:
-    SkGlyphCache(SkTypeface*, const SkDescriptor*);
+    // we take ownership of the scalercontext
+    SkGlyphCache(SkTypeface*, const SkDescriptor*, SkScalerContext*);
     ~SkGlyphCache();
 
     enum MetricsType {
@@ -223,7 +224,7 @@ private:
     SkPaint::FontMetrics fFontMetrics;
 
     enum {
-        kHashBits   = 12,
+        kHashBits   = 8,
         kHashCount  = 1 << kHashBits,
         kHashMask   = kHashCount - 1
     };