| Index: src/fonts/SkGScalerContext.cpp
|
| diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp
|
| index e1ab921337dc1da23e11ca6825acf5a0d4540ce9..e543fdbd0a395a5b670203519b5f74e34a9b1857 100644
|
| --- a/src/fonts/SkGScalerContext.cpp
|
| +++ b/src/fonts/SkGScalerContext.cpp
|
| @@ -22,8 +22,7 @@ protected:
|
| 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;
|
| @@ -138,8 +137,7 @@ void SkGScalerContext::generatePath(const SkGlyph& glyph, SkPath* 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();
|
|
|