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/device | |
| 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/device')
| -rw-r--r-- | src/device/xps/SkXPSDevice.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp index a5c001393d..1c06235aef 100644 --- a/src/device/xps/SkXPSDevice.cpp +++ b/src/device/xps/SkXPSDevice.cpp @@ -512,7 +512,7 @@ static void transform_offsets(SkScalar* stopOffsets, const int numOffsets, SkScalar startToStop = (stopTransformed.fX - startTransformed.fX) + (stopTransformed.fY - startTransformed.fY); //Percentage along transformed line. - stopOffsets[i] = SkScalarDiv(startToStop, startToEnd); + stopOffsets[i] = startToStop / startToEnd; } } @@ -1396,10 +1396,8 @@ void SkXPSDevice::convertToPpm(const SkMaskFilter* filter, SkVector* ppuScale, const SkIRect& clip, SkIRect* clipIRect) { //This action is in unit space, but the ppm is specified in physical space. - ppuScale->fX = SkScalarDiv(this->fCurrentPixelsPerMeter.fX, - this->fCurrentUnitsPerMeter.fX); - ppuScale->fY = SkScalarDiv(this->fCurrentPixelsPerMeter.fY, - this->fCurrentUnitsPerMeter.fY); + ppuScale->set(fCurrentPixelsPerMeter.fX / fCurrentUnitsPerMeter.fX, + fCurrentPixelsPerMeter.fY / fCurrentUnitsPerMeter.fY); matrix->postScale(ppuScale->fX, ppuScale->fY); |