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

src/core/SkScalerContext.cpp

Index: src/core/SkScalerContext.cpp
===================================================================
--- src/core/SkScalerContext.cpp	(revision 9053)
+++ src/core/SkScalerContext.cpp	(working copy)
@@ -663,8 +663,16 @@
     this->internalGetPath(glyph, NULL, path, NULL);
 }
 
-void SkScalerContext::getFontMetrics(SkPaint::FontMetrics* mx,
-                                     SkPaint::FontMetrics* my) {
+void SkScalerContext::getFontMetrics(SkPaint::FontMetrics* fm) {
+    // All of this complexity should go away when we change generateFontMetrics
+    // to just take one parameter (since it knows if it is vertical or not)
+    SkPaint::FontMetrics* mx = NULL;
+    SkPaint::FontMetrics* my = NULL;
+    if (fRec.fFlags & kVertical_Flag) {
+        mx = fm;
+    } else {
+        my = fm;
+    }
     this->generateFontMetrics(mx, my);
 }