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 /src/gpu/GrOvalRenderer.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 'src/gpu/GrOvalRenderer.cpp')
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index ebac42fcac..b562167424 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -1253,11 +1253,11 @@ public: const SkRect& bounds = geom.fBounds; // This adjusts the "radius" to include the half-pixel border - SkScalar offsetDx = SkScalarDiv(geom.fGeoDx, xRadius); - SkScalar offsetDy = SkScalarDiv(geom.fGeoDy, yRadius); + SkScalar offsetDx = geom.fGeoDx / xRadius; + SkScalar offsetDy = geom.fGeoDy / yRadius; - SkScalar innerRatioX = SkScalarDiv(xRadius, geom.fInnerXRadius); - SkScalar innerRatioY = SkScalarDiv(yRadius, geom.fInnerYRadius); + SkScalar innerRatioX = xRadius / geom.fInnerXRadius; + SkScalar innerRatioY = yRadius / geom.fInnerYRadius; verts[0].fPos = SkPoint::Make(bounds.fLeft, bounds.fTop); verts[0].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, -1.0f - offsetDy); @@ -1386,8 +1386,8 @@ static GrBatch* create_diellipse_batch(GrColor color, SkScalar b = viewMatrix[SkMatrix::kMSkewX]; SkScalar c = viewMatrix[SkMatrix::kMSkewY]; SkScalar d = viewMatrix[SkMatrix::kMScaleY]; - SkScalar geoDx = SkScalarDiv(SK_ScalarHalf, SkScalarSqrt(a*a + c*c)); - SkScalar geoDy = SkScalarDiv(SK_ScalarHalf, SkScalarSqrt(b*b + d*d)); + SkScalar geoDx = SK_ScalarHalf / SkScalarSqrt(a*a + c*c); + SkScalar geoDy = SK_ScalarHalf / SkScalarSqrt(b*b + d*d); DIEllipseBatch::Geometry geometry; geometry.fViewMatrix = viewMatrix; |