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

src/core/SkGlyphCache.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkGlyphCache_DEFINED
@@ skipping 167 matching lines @@
             }
         }
         void forget() {
             fCache = NULL;
         }
     private:
         const SkGlyphCache* fCache;
     };
 
 private:
-    SkGlyphCache(SkTypeface*, const SkDescriptor*);
+    // we take ownership of the scalercontext
+    SkGlyphCache(SkTypeface*, const SkDescriptor*, SkScalerContext*);
     ~SkGlyphCache();
 
     enum MetricsType {
         kJustAdvance_MetricsType,
         kFull_MetricsType
     };
 
     SkGlyph* lookupMetrics(uint32_t id, MetricsType);
     static bool DetachProc(const SkGlyphCache*, void*) { return true; }
 
@@ skipping 17 matching lines @@
         }
         *head = this;
     }
 
     SkGlyphCache*       fNext, *fPrev;
     SkDescriptor*       fDesc;
     SkScalerContext*    fScalerContext;
     SkPaint::FontMetrics fFontMetrics;
 
     enum {
-        kHashBits   = 12,
+        kHashBits   = 8,
         kHashCount  = 1 << kHashBits,
         kHashMask   = kHashCount - 1
     };
     SkGlyph*            fGlyphHash[kHashCount];
     SkTDArray<SkGlyph*> fGlyphArray;
     SkChunkAlloc        fGlyphAlloc;
 
     int fMetricsCount, fAdvanceCount;
 
     struct CharGlyphRec {
@@ skipping 54 matching lines @@
         }
     }
 
 private:
     SkGlyphCache*   fCache;
 
     static bool DetachProc(const SkGlyphCache*, void*);
 };
 
 #endif