diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-20 14:53:45 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-20 14:53:45 +0000 |
| commit | 1878651990d7c9da72cf43481432232bbef3550d (patch) | |
| tree | fc8d4f6c4a594268c7487cad674c765ee0ef5890 /src/gpu | |
| parent | 941ff78d79a3239d8a4c18be868423e52563bca5 (diff) | |
Rename SkMatrix::get(Max|Min)Stretch to get(Min|Max)Scale
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/295713002
git-svn-id: http://skia.googlecode.com/svn/trunk@14798 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrPathUtils.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index 5fead5dea2..81921e36c8 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -14,8 +14,8 @@ SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol, const SkMatrix& viewM, const SkRect& pathBounds) { // In order to tesselate the path we get a bound on how much the matrix can - // stretch when mapping to screen coordinates. - SkScalar stretch = viewM.getMaxStretch(); + // scale when mapping to screen coordinates. + SkScalar stretch = viewM.getMaxScale(); SkScalar srcTol = devTol; if (stretch < 0) { diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 854839de2c..cddf50a98c 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1184,7 +1184,7 @@ void SkGpuDevice::drawBitmapCommon(const SkDraw& draw, break; case SkPaint::kMedium_FilterLevel: tileFilterPad = 1; - if (fContext->getMatrix().getMinStretch() < SK_Scalar1) { + if (fContext->getMatrix().getMinScale() < SK_Scalar1) { textureFilterMode = GrTextureParams::kMipMap_FilterMode; } else { // Don't trigger MIP level generation unnecessarily. @@ -1193,7 +1193,7 @@ void SkGpuDevice::drawBitmapCommon(const SkDraw& draw, break; case SkPaint::kHigh_FilterLevel: // Minification can look bad with the bicubic effect. - if (fContext->getMatrix().getMinStretch() >= SK_Scalar1) { + if (fContext->getMatrix().getMinScale() >= SK_Scalar1) { // We will install an effect that does the filtering in the shader. textureFilterMode = GrTextureParams::kNone_FilterMode; tileFilterPad = GrBicubicEffect::kFilterTexelPad; diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index a670eae613..c4d1c27c00 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1725,7 +1725,7 @@ void GrGpuGL::onGpuDrawPath(const GrPath* path, SkPath::FillType fill) { vmi.mapRect(&bounds); // theoretically could set bloat = 0, instead leave it because of matrix inversion // precision. - SkScalar bloat = drawState->getViewMatrix().getMaxStretch() * SK_ScalarHalf; + SkScalar bloat = drawState->getViewMatrix().getMaxScale() * SK_ScalarHalf; bounds.outset(bloat, bloat); } else { avmr.setIdentity(drawState); @@ -1818,7 +1818,7 @@ void GrGpuGL::onGpuDrawPaths(int pathCount, const GrPath** paths, vmi.mapRect(&bounds); // theoretically could set bloat = 0, instead leave it because of matrix inversion // precision. - SkScalar bloat = drawState->getViewMatrix().getMaxStretch() * SK_ScalarHalf; + SkScalar bloat = drawState->getViewMatrix().getMaxScale() * SK_ScalarHalf; bounds.outset(bloat, bloat); } else { avmr.setIdentity(drawState); |