Remove vertical/horizontal metrics selection.

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
 #include "SkPath.h"
 #include "SkCanvas.h"
 
 class SkGScalerContext : public SkScalerContext {
 public:
     SkGScalerContext(SkGTypeface*, const SkDescriptor*);
     virtual ~SkGScalerContext();
 
 protected:
     virtual unsigned generateGlyphCount() SK_OVERRIDE;
     virtual uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE;
     virtual void generateAdvance(SkGlyph*) SK_OVERRIDE;
     virtual void generateMetrics(SkGlyph*) SK_OVERRIDE;
     virtual void generateImage(const SkGlyph&) SK_OVERRIDE;
     virtual void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics* mX,
-                                     SkPaint::FontMetrics* mY) SK_OVERRIDE;
+    virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
 
 private:
     SkGTypeface*     fFace;
     SkScalerContext* fProxy;
     SkMatrix         fMatrix;
 };
 
 #define STD_SIZE    1
 
 #include "SkDescriptor.h"
@@ skipping 94 matching lines @@
     } else {
         fProxy->getImage(glyph);
     }
 }
 
 void SkGScalerContext::generatePath(const SkGlyph& glyph, SkPath* path) {
     fProxy->getPath(glyph, path);
     path->transform(fMatrix);
 }
 
-void SkGScalerContext::generateFontMetrics(SkPaint::FontMetrics*,
-                                           SkPaint::FontMetrics* metrics) {
+void SkGScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) {
     fProxy->getFontMetrics(metrics);
     if (metrics) {
         SkScalar scale = fMatrix.getScaleY();
         metrics->fTop = SkScalarMul(metrics->fTop, scale);
         metrics->fAscent = SkScalarMul(metrics->fAscent, scale);
         metrics->fDescent = SkScalarMul(metrics->fDescent, scale);
         metrics->fBottom = SkScalarMul(metrics->fBottom, scale);
         metrics->fLeading = SkScalarMul(metrics->fLeading, scale);
         metrics->fAvgCharWidth = SkScalarMul(metrics->fAvgCharWidth, scale);
         metrics->fXMin = SkScalarMul(metrics->fXMin, scale);
@@ skipping 102 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif