diff options
author | Yuqian Li <liyuqian@google.com> | 2018-04-23 16:48:22 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-23 21:10:36 +0000 |
commit | 2d2c1e32ce75bb85816716a9b14ed1cdbf971136 (patch) | |
tree | ace9f89428b615aedab5af8dbb7b5dcfad6ced5d | |
parent | 0e9e43b9aba9ddcbc5804f8ea3c92ec8f5d3ef82 (diff) |
Fix variable name collision
Bug: skia:
Change-Id: I0b62ae9dac14d75e94d2c29d335703d41fee77ed
Reviewed-on: https://skia-review.googlesource.com/123280
Commit-Queue: Yuqian Li <liyuqian@google.com>
Commit-Queue: Stan Iliev <stani@google.com>
Auto-Submit: Yuqian Li <liyuqian@google.com>
Reviewed-by: Stan Iliev <stani@google.com>
-rw-r--r-- | src/core/SkBlitter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index e53a523084..da2ea0c08e 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -123,15 +123,15 @@ void SkBlitter::blitCoverageDeltas(SkCoverageDeltaList* deltas, const SkIRect& c int topOverClip = clip.fTop - antiRect.fY; int botOverClip = antiRect.fY + antiRect.fHeight - clip.fBottom; - int x = antiRect.fX; - int y = antiRect.fY; + int rectX = antiRect.fX; + int rectY = antiRect.fY; int width = antiRect.fWidth; int height = antiRect.fHeight; SkAlpha leftAlpha = antiRect.fLeftAlpha; SkAlpha rightAlpha = antiRect.fRightAlpha; if (leftOverClip > 0) { - x = clip.fLeft; + rectX = clip.fLeft; width -= leftOverClip; leftAlpha = 0xFF; } @@ -140,14 +140,14 @@ void SkBlitter::blitCoverageDeltas(SkCoverageDeltaList* deltas, const SkIRect& c rightAlpha = 0xFF; } if (topOverClip > 0) { - y = clip.fTop; + rectY = clip.fTop; height -= topOverClip; } if (botOverClip > 0) { height -= botOverClip; } - this->blitAntiRect(x, y, width, height, leftAlpha, rightAlpha); + this->blitAntiRect(rectX, rectY, width, height, leftAlpha, rightAlpha); y += antiRect.fHeight - 1; // -1 because ++y in the for loop continue; } |