we only need one fontmetrics, since the paint (and fontcache) now know explicitly

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 77 matching lines @@
         this will trigger that.
     */
     const void* findImage(const SkGlyph&);
     /** Return the Path associated with the glyph. If it has not been generated
         this will trigger that.
     */
     const SkPath* findPath(const SkGlyph&);
 
     /** Return the vertical metrics for this strike.
     */
-    const SkPaint::FontMetrics& getFontMetricsY() const {
-        return fFontMetricsY;
+    const SkPaint::FontMetrics& getFontMetrics() const {
+        return fFontMetrics;
     }
 
     const SkDescriptor& getDescriptor() const { return *fDesc; }
 
     SkMask::Format getMaskFormat() const {
         return fScalerContext->getMaskFormat();
     }
 
     bool isSubpixel() const {
         return fScalerContext->isSubpixel();
@@ skipping 103 matching lines @@
         if (*head) {
             (*head)->fPrev = this;
             fNext = *head;
         }
         *head = this;
     }
 
     SkGlyphCache*       fNext, *fPrev;
     SkDescriptor*       fDesc;
     SkScalerContext*    fScalerContext;
-    SkPaint::FontMetrics fFontMetricsY;
+    SkPaint::FontMetrics fFontMetrics;
 
     enum {
         kHashBits   = 12,
         kHashCount  = 1 << kHashBits,
         kHashMask   = kHashCount - 1
     };
     SkGlyph*            fGlyphHash[kHashCount];
     SkTDArray<SkGlyph*> fGlyphArray;
     SkChunkAlloc        fGlyphAlloc;
     SkChunkAlloc        fImageAlloc;
@@ skipping 63 matching lines @@
         }
     }
 
 private:
     SkGlyphCache*   fCache;
 
     static bool DetachProc(const SkGlyphCache*, void*);
 };
 
 #endif