diff options
| author |  bungeman <bungeman@google.com> | 2014-10-29 12:46:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-29 12:46:52 -0700 |
| commit | 7316b100dfd2a0f9553e7f1e9f3a5f4c46b8e4db (patch) | |
| tree | edc63fe34847137e9e89c334558eb4f317e824b6 /src/ports/SkFontHost_FreeType.cpp | |
| parent | b15b4c1ce006319acf764a25ee4a6b73283654f8 (diff) | |
Revert of scale xmin/xmax etc in fontmetrics (patchset #1 id:1 of https://codereview.chromium.org/690533004/)
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
Diffstat (limited to 'src/ports/SkFontHost_FreeType.cpp')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index b429f592e1..9acabbb5c2 100644 --- 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; } |