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

src/core/SkGlyphCache.h

Index: src/core/SkGlyphCache.h
===================================================================
--- src/core/SkGlyphCache.h	(revision 9053)
+++ src/core/SkGlyphCache.h	(working copy)
@@ -95,8 +95,8 @@
 
     /** 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; }
@@ -220,7 +220,7 @@
     SkGlyphCache*       fNext, *fPrev;
     SkDescriptor*       fDesc;
     SkScalerContext*    fScalerContext;
-    SkPaint::FontMetrics fFontMetricsY;
+    SkPaint::FontMetrics fFontMetrics;
 
     enum {
         kHashBits   = 12,