| Index: src/gpu/batches/GrCopySurfaceBatch.cpp
|
| diff --git a/src/gpu/batches/GrCopySurfaceBatch.cpp b/src/gpu/batches/GrCopySurfaceBatch.cpp
|
| index 098f7c7704c07ad9fba41256b8017c71f535ca5b..a59ed38f51e62d4718db5108c358d032dd0d77f1 100644
|
| --- a/src/gpu/batches/GrCopySurfaceBatch.cpp
|
| +++ b/src/gpu/batches/GrCopySurfaceBatch.cpp
|
| @@ -9,12 +9,12 @@
|
| #include "GrCopySurfaceBatch.h"
|
|
|
| // returns true if the read/written rect intersects the src/dst and false if not.
|
| -static bool clip_srcrect_and_dstpoint(const GrSurface* dst,
|
| - const GrSurface* src,
|
| - const SkIRect& srcRect,
|
| - const SkIPoint& dstPoint,
|
| - SkIRect* clippedSrcRect,
|
| - SkIPoint* clippedDstPoint) {
|
| +bool GrCopySurfaceBatch::ClipSrcRectAndDstPoint(const GrSurface* dst,
|
| + const GrSurface* src,
|
| + const SkIRect& srcRect,
|
| + const SkIPoint& dstPoint,
|
| + SkIRect* clippedSrcRect,
|
| + SkIPoint* clippedDstPoint) {
|
| *clippedSrcRect = srcRect;
|
| *clippedDstPoint = dstPoint;
|
|
|
| @@ -67,12 +67,7 @@ GrBatch* GrCopySurfaceBatch::Create(GrSurface* dst, GrSurface* src, const SkIRec
|
| SkIRect clippedSrcRect;
|
| SkIPoint clippedDstPoint;
|
| // If the rect is outside the src or dst then we've already succeeded.
|
| - if (!clip_srcrect_and_dstpoint(dst,
|
| - src,
|
| - srcRect,
|
| - dstPoint,
|
| - &clippedSrcRect,
|
| - &clippedDstPoint)) {
|
| + if (!ClipSrcRectAndDstPoint(dst, src, srcRect, dstPoint, &clippedSrcRect, &clippedDstPoint)) {
|
| return nullptr;
|
| }
|
| return new GrCopySurfaceBatch(dst, src, clippedSrcRect, clippedDstPoint);
|
|
|