Revert of scale xmin/xmax etc in fontmetrics (patchset #1 id:1 of https://codereview...

Reason for revert:
Breaking tests in Chromium, and not in a good way.

Original issue's description:
> scale xmin/xmax etc in fontmetrics
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f8c2feffd68b3262f3c039ec1bd517c5f6cc9e4c

TBR=reed@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/686263002

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index b429f59..9acabbb 100644 (file)
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1495,10 +1495,10 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics
     metrics->fBottom = ymin * scale;
     metrics->fLeading = leading * scale;
     metrics->fAvgCharWidth = avgCharWidth * scale;
-    metrics->fXMin = xmin * scale;
-    metrics->fXMax = xmax * scale;
-    metrics->fXHeight = x_height * scale;
-    metrics->fCapHeight = cap_height * scale;
+    metrics->fXMin = xmin;
+    metrics->fXMax = xmax;
+    metrics->fXHeight = x_height;
+    metrics->fCapHeight = cap_height;
     metrics->fUnderlineThickness = underlineThickness * scale;
     metrics->fUnderlinePosition = underlinePosition * scale;
 }