diff options
| author |  Mike Reed <reed@google.com> | 2018-01-08 17:09:54 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-08 22:32:51 +0000 |
| commit | 185ffe916eb374ab3dfe3f42e265d26dacdd30ca (patch) | |
| tree | e1a3bcdcc9465304117c53f7c0dc99ad339d9507 /src/gpu/ops | |
| parent | c59b03071f5b255b5ce42749ff5d8238adca13e2 (diff) | |
make growToInclude private
Bug: skia:
Change-Id: Id55344ba2f33563d22c2bf4d5829a9a31095a47d
Reviewed-on: https://skia-review.googlesource.com/92143
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrAAHairLinePathRenderer.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/ops/GrDrawAtlasOp.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp index 1502b80a50..2342982943 100644 --- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp @@ -21,6 +21,7 @@ #include "SkMatrixPriv.h" #include "SkPoint3.h" #include "SkPointPriv.h" +#include "SkRectPriv.h" #include "SkStroke.h" #include "SkTemplates.h" #include "effects/GrBezierEffect.h" @@ -750,7 +751,7 @@ bool check_bounds(const SkMatrix& viewMatrix, const SkRect& devBounds, void* ver actualBounds.set(pos.fX, pos.fY, pos.fX, pos.fY); first = false; } else { - actualBounds.growToInclude(pos); + SkRectPriv::GrowToInclude(&actualBounds, pos); } } if (!first) { diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp index 2c6f162c64..fa948b753d 100644 --- a/src/gpu/ops/GrDrawAtlasOp.cpp +++ b/src/gpu/ops/GrDrawAtlasOp.cpp @@ -82,25 +82,25 @@ GrDrawAtlasOp::GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, GrColor color, *(reinterpret_cast<SkPoint*>(currVertex)) = strip[0]; *(reinterpret_cast<SkPoint*>(currVertex + texOffset)) = SkPoint::Make(currRect.fLeft, currRect.fTop); - bounds.growToInclude(strip[0]); + SkRectPriv::GrowToInclude(&bounds, strip[0]); currVertex += vertexStride; *(reinterpret_cast<SkPoint*>(currVertex)) = strip[1]; *(reinterpret_cast<SkPoint*>(currVertex + texOffset)) = SkPoint::Make(currRect.fLeft, currRect.fBottom); - bounds.growToInclude(strip[1]); + SkRectPriv::GrowToInclude(&bounds, strip[1]); currVertex += vertexStride; *(reinterpret_cast<SkPoint*>(currVertex)) = strip[2]; *(reinterpret_cast<SkPoint*>(currVertex + texOffset)) = SkPoint::Make(currRect.fRight, currRect.fTop); - bounds.growToInclude(strip[2]); + SkRectPriv::GrowToInclude(&bounds, strip[2]); currVertex += vertexStride; *(reinterpret_cast<SkPoint*>(currVertex)) = strip[3]; *(reinterpret_cast<SkPoint*>(currVertex + texOffset)) = SkPoint::Make(currRect.fRight, currRect.fBottom); - bounds.growToInclude(strip[3]); + SkRectPriv::GrowToInclude(&bounds, strip[3]); currVertex += vertexStride; } |