diff options
author | reed <reed@google.com> | 2015-05-12 10:28:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 10:28:06 -0700 |
commit | 2629697933b5cc975e45d2a45c48f803fc6cbcec (patch) | |
tree | 53730ca8354552773d93adfe7ade5f1e2bc18192 /gm | |
parent | 39a9a5069b25aa8b9529118cfd0ece5f412fb56b (diff) |
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
Diffstat (limited to 'gm')
-rw-r--r-- | gm/glyph_pos.cpp | 14 | ||||
-rw-r--r-- | gm/gradients.cpp | 14 | ||||
-rw-r--r-- | gm/gradients_2pt_conical.cpp | 32 | ||||
-rw-r--r-- | gm/gradients_no_texture.cpp | 4 | ||||
-rw-r--r-- | gm/imagefiltersclipped.cpp | 3 | ||||
-rw-r--r-- | gm/imagefiltersscaled.cpp | 3 | ||||
-rw-r--r-- | gm/resizeimagefilter.cpp | 6 | ||||
-rw-r--r-- | gm/shaderbounds.cpp | 7 | ||||
-rw-r--r-- | gm/stringart.cpp | 2 |
9 files changed, 47 insertions, 38 deletions
diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index 16cdfca11a..0da59ac6f9 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -82,8 +82,10 @@ protected: canvas->scale(3.0f, 3.0f); SkMatrix skew; skew.setIdentity(); - skew.setSkewX(8.0f / 25.0f); - skew.setSkewY(2.0f / 25.0f); + skew.setSkewX(SkScalarDiv(8.0f, + 25.0f)); + skew.setSkewY(SkScalarDiv(2.0f, + 25.0f)); canvas->concat(skew); drawTestCase(canvas, 1.0f); canvas->restore(); @@ -93,9 +95,11 @@ protected: canvas->save(); SkMatrix perspective; perspective.setIdentity(); - perspective.setPerspX(-SkScalarInvert(340)); - perspective.setSkewX(8.0f / 25.0f); - perspective.setSkewY(2.0f / 25.0f); + perspective.setPerspX(-SkScalarDiv(SK_Scalar1, 340.0f)); + perspective.setSkewX(SkScalarDiv(8.0f, + 25.0f)); + perspective.setSkewY(SkScalarDiv(2.0f, + 25.0f)); canvas->concat(perspective); diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 4e6aba9521..eb1409d625 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -80,8 +80,8 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, static SkShader* Make2Conical(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 10; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 10); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center1, radius1, @@ -185,8 +185,10 @@ protected: // apply an increasing y perspective as we move to the right SkMatrix perspective; perspective.setIdentity(); - perspective.setPerspY(SkIntToScalar(i+1) / 500); - perspective.setSkewX(SkIntToScalar(i+1) / 10); + perspective.setPerspY(SkScalarDiv(SkIntToScalar((unsigned) i+1), + SkIntToScalar(500))); + perspective.setSkewX(SkScalarDiv(SkIntToScalar((unsigned) i+1), + SkIntToScalar(10))); SkShader* shader = gGradMakers[j](pts, gGradData[i], tm, perspective); @@ -218,8 +220,8 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkMatrix perspective; perspective.setIdentity(); - perspective.setPerspY(0.001f); - perspective.setSkewX(SkIntToScalar(8) / 25); + perspective.setPerspY(SkScalarDiv(SK_Scalar1, SkIntToScalar(1000))); + perspective.setSkewX(SkScalarDiv(SkIntToScalar(8), SkIntToScalar(25))); canvas->concat(perspective); INHERITED::onDraw(canvas); } diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp index c865d7177f..f43356eaf6 100644 --- a/gm/gradients_2pt_conical.cpp +++ b/gm/gradients_2pt_conical.cpp @@ -40,8 +40,8 @@ static const GradData gGradData[] = { static SkShader* Make2ConicalOutside(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 10; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 10); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center0, radius0, @@ -53,8 +53,8 @@ static SkShader* Make2ConicalOutside(const SkPoint pts[2], const GradData& data, static SkShader* Make2ConicalOutsideFlip(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 10; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 10); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center1, radius1, @@ -145,7 +145,7 @@ static SkShader* Make2ConicalZeroRadOutside(const SkPoint pts[2], const GradData SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; SkScalar radius0 = 0.f; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center0, radius0, @@ -158,7 +158,7 @@ static SkShader* Make2ConicalZeroRadFlipOutside(const SkPoint pts[2], const Grad SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; SkScalar radius0 = 0.f; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center1, radius1, @@ -170,8 +170,8 @@ static SkShader* Make2ConicalZeroRadFlipOutside(const SkPoint pts[2], const Grad static SkShader* Make2ConicalEdgeX(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 7; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 7); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX + radius1, center1.fY); @@ -184,8 +184,8 @@ static SkShader* Make2ConicalEdgeX(const SkPoint pts[2], const GradData& data, static SkShader* Make2ConicalEdgeY(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 7; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 7); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX, center1.fY + radius1); @@ -199,7 +199,7 @@ static SkShader* Make2ConicalZeroRadEdgeX(const SkPoint pts[2], const GradData& SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; SkScalar radius0 = 0.f; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX + radius1, center1.fY); @@ -213,7 +213,7 @@ static SkShader* Make2ConicalZeroRadEdgeY(const SkPoint pts[2], const GradData& SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; SkScalar radius0 = 0.f; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX, center1.fY + radius1); @@ -226,8 +226,8 @@ static SkShader* Make2ConicalZeroRadEdgeY(const SkPoint pts[2], const GradData& static SkShader* Make2ConicalTouchX(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 7; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 7); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX - radius1 + radius0, center1.fY); @@ -240,8 +240,8 @@ static SkShader* Make2ConicalTouchX(const SkPoint pts[2], const GradData& data, static SkShader* Make2ConicalTouchY(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, const SkMatrix& localMatrix) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 7; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 7); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); center0.set(center1.fX, center1.fY + radius1 - radius0); diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index 391472a0c7..dea9a65784 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -59,8 +59,8 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShade static SkShader* Make2Conical(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center0, center1; - SkScalar radius0 = (pts[1].fX - pts[0].fX) / 10; - SkScalar radius1 = (pts[1].fX - pts[0].fX) / 3; + SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 10); + SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); return SkGradientShader::CreateTwoPointConical(center1, radius1, diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index cc636aa276..50066fe6cd 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -115,7 +115,8 @@ protected: canvas->scale(SkScalarInvert(RESIZE_FACTOR_X), SkScalarInvert(RESIZE_FACTOR_Y)); } - canvas->drawCircle(r.centerX(), r.centerY(), r.width() * 2 / 5, paint); + canvas->drawCircle(r.centerX(), r.centerY(), + SkScalarDiv(r.width()*2, SkIntToScalar(5)), paint); canvas->restore(); canvas->translate(r.width() + margin, 0); } diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 9a80964a0e..4dcf7535da 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -134,7 +134,8 @@ protected: canvas->scale(SkScalarInvert(RESIZE_FACTOR), SkScalarInvert(RESIZE_FACTOR)); } - canvas->drawCircle(r.centerX(), r.centerY(), r.width()*2/5, paint); + canvas->drawCircle(r.centerX(), r.centerY(), + SkScalarDiv(r.width()*2, SkIntToScalar(5)), paint); canvas->restore(); canvas->translate(r.width() * scales[j].fX + margin, 0); } diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp index 2edb802838..14f76b56cf 100644 --- a/gm/resizeimagefilter.cpp +++ b/gm/resizeimagefilter.cpp @@ -32,8 +32,8 @@ protected: SkRect dstRect; canvas->getTotalMatrix().mapRect(&dstRect, rect); canvas->save(); - SkScalar deviceScaleX = deviceSize.width() / dstRect.width(); - SkScalar deviceScaleY = deviceSize.height() / dstRect.height(); + SkScalar deviceScaleX = SkScalarDiv(deviceSize.width(), dstRect.width()); + SkScalar deviceScaleY = SkScalarDiv(deviceSize.height(), dstRect.height()); canvas->translate(rect.x(), rect.y()); canvas->scale(deviceScaleX, deviceScaleY); canvas->translate(-rect.x(), -rect.y()); @@ -96,7 +96,7 @@ protected: SkPaint paint; paint.setColor(0xFF00FF00); SkRect ovalRect = SkRect::MakeWH(16, 16); - ovalRect.inset(SkIntToScalar(2)/3, SkIntToScalar(2)/3); + ovalRect.inset(SkScalarDiv(2.0f, 3.0f), SkScalarDiv(2.0f, 3.0f)); bitmapCanvas.drawOval(ovalRect, paint); } SkRect inRect = SkRect::MakeXYWH(-4, -4, 20, 20); diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp index 4363d4eee3..e86ab05431 100644 --- a/gm/shaderbounds.cpp +++ b/gm/shaderbounds.cpp @@ -80,9 +80,10 @@ protected: if (background) { scale = 0.6f; } - SkScalar shaderWidth = width / scale; - SkScalar shaderHeight = height / scale; - SkMatrix shaderScale = SkMatrix::MakeScale(scale); + SkScalar shaderWidth = SkScalarDiv(SkIntToScalar(width), scale); + SkScalar shaderHeight = SkScalarDiv(SkIntToScalar(height), scale); + SkMatrix shaderScale; + shaderScale.setScale(scale, scale); SkShader* shader = fShaderMaker(shaderWidth, shaderHeight, background, shaderScale); return shader; } diff --git a/gm/stringart.cpp b/gm/stringart.cpp index 7c9a22ee36..ed5fe0e78f 100644 --- a/gm/stringart.cpp +++ b/gm/stringart.cpp @@ -47,7 +47,7 @@ protected: SkPoint rp = SkPoint::Make(length*SkScalarCos(step) + center.fX, length*SkScalarSin(step) + center.fY); path.lineTo(rp); - length += angle / SkScalarHalf(SK_ScalarPI); + length += SkScalarDiv(angle, SkScalarHalf(SK_ScalarPI)); step += angle; } path.close(); |