From 2629697933b5cc975e45d2a45c48f803fc6cbcec Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 12 May 2015 10:28:06 -0700 Subject: 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: Review URL: https://codereview.chromium.org/1138263002 --- src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/effects/gradients') diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index f7b3eb89b2..bc70d6bca4 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -357,7 +357,7 @@ static ConicalType set_matrix_focal_conical(const SkTwoPointConicalGradient& sha // Scale factor 1 / (1 - focalX * focalX) SkScalar oneMinusF2 = 1.f - SkScalarMul(*focalX, *focalX); - SkScalar s = SkScalarInvert(oneMinusF2); + SkScalar s = SkScalarDiv(1.f, oneMinusF2); if (s >= 0.f) { @@ -1115,7 +1115,8 @@ private: : INHERITED(ctx, shader, matrix, tm), fInfo(info) { this->initClassID(); if (shader.getStartRadius() != shader.getEndRadius()) { - fTLimit = shader.getStartRadius() / (shader.getStartRadius() - shader.getEndRadius()); + fTLimit = SkScalarDiv(shader.getStartRadius(), + (shader.getStartRadius() - shader.getEndRadius())); } else { fTLimit = SK_ScalarMin; } -- cgit v1.2.3