From 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 12 May 2015 10:37:34 -0700 Subject: 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 --- gm/resizeimagefilter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/resizeimagefilter.cpp') diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp index 14f76b56cf..2edb802838 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 = SkScalarDiv(deviceSize.width(), dstRect.width()); - SkScalar deviceScaleY = SkScalarDiv(deviceSize.height(), dstRect.height()); + SkScalar deviceScaleX = deviceSize.width() / dstRect.width(); + SkScalar deviceScaleY = 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(SkScalarDiv(2.0f, 3.0f), SkScalarDiv(2.0f, 3.0f)); + ovalRect.inset(SkIntToScalar(2)/3, SkIntToScalar(2)/3); bitmapCanvas.drawOval(ovalRect, paint); } SkRect inRect = SkRect::MakeXYWH(-4, -4, 20, 20); -- cgit v1.2.3