diff options
| author |  reed <reed@google.com> | 2015-05-12 10:37:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:37:34 -0700 |
| commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b (patch) | |
| tree | 1ad73d17a3314363d114ddc95932e271ae1e828a /gm/glyph_pos.cpp | |
| parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 (diff) | |
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
Diffstat (limited to 'gm/glyph_pos.cpp')
| -rw-r--r-- | gm/glyph_pos.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index 0da59ac6f9..16cdfca11a 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -82,10 +82,8 @@ protected: canvas->scale(3.0f, 3.0f); SkMatrix skew; skew.setIdentity(); - skew.setSkewX(SkScalarDiv(8.0f, - 25.0f)); - skew.setSkewY(SkScalarDiv(2.0f, - 25.0f)); + skew.setSkewX(8.0f / 25.0f); + skew.setSkewY(2.0f / 25.0f); canvas->concat(skew); drawTestCase(canvas, 1.0f); canvas->restore(); @@ -95,11 +93,9 @@ protected: canvas->save(); SkMatrix perspective; perspective.setIdentity(); - perspective.setPerspX(-SkScalarDiv(SK_Scalar1, 340.0f)); - perspective.setSkewX(SkScalarDiv(8.0f, - 25.0f)); - perspective.setSkewY(SkScalarDiv(2.0f, - 25.0f)); + perspective.setPerspX(-SkScalarInvert(340)); + perspective.setSkewX(8.0f / 25.0f); + perspective.setSkewY(2.0f / 25.0f); canvas->concat(perspective); |