| commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b | [log] [tgz] |
|---|---|---|
| author | reed <reed@google.com> | Tue May 12 10:37:34 2015 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Tue May 12 10:37:34 2015 -0700 |
| tree | 1ad73d17a3314363d114ddc95932e271ae1e828a | |
| parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 [diff] [blame] |
Revert of Revert of stop calling SkScalarDiv (patchset #1 id:1 of https://codereview.chromium.org/1138263002/) Reason for revert: android patched, blink has rolled Original issue's description: > Revert of stop calling SkScalarDiv (patchset #4 id:60001 of https://codereview.chromium.org/1135053002/) > > Reason for revert: > need to wait for Blink roll (and patch android) > > Original issue's description: > > stop calling SkScalarDiv > > > > BUG=skia: > > TBR= > > > > Committed: https://skia.googlesource.com/skia/+/67d71c898249a7af3523b16c6a69895a63bfae0a > > TBR= > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/2629697933b5cc975e45d2a45c48f803fc6cbcec TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1135693003
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 0a69b43..5c53b9d 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1198,8 +1198,7 @@ // This means do not try to scale embedded bitmaps; only scale bitmaps in bitmap only fonts. if (!FT_IS_SCALABLE(fFace) && fScaleY && fFace->size->metrics.y_ppem) { // NOTE: both dimensions are scaled by y_ppem. this is WAI. - scaleGlyphMetrics(*glyph, SkScalarDiv(SkFixedToScalar(fScaleY), - SkIntToScalar(fFace->size->metrics.y_ppem))); + scaleGlyphMetrics(*glyph, SkFixedToScalar(fScaleY) / fFace->size->metrics.y_ppem); } #ifdef ENABLE_GLYPH_SPEW