fix ninepatch iter from generating invalid rects

BUG=skia:

Review URL: https://codereview.chromium.org/1451183004
This commit is contained in:
joshualitt 2015-11-17 12:11:57 -08:00 committed by Commit bot
parent f769c1f80e
commit 3622d41703

View File

@ -56,15 +56,15 @@ bool SkNinePatchIter::next(SkRect* src, SkRect* dst) {
const int x = fCurrX;
const int y = fCurrY;
SkASSERT(x >= 0 && x < 4);
SkASSERT(y >= 0 && y < 4);
SkASSERT(x >= 0 && x < 3);
SkASSERT(y >= 0 && y < 3);
src->set(fSrcX[x], fSrcY[y], fSrcX[x + 1], fSrcY[y + 1]);
dst->set(fDstX[x], fDstY[y], fDstX[x + 1], fDstY[y + 1]);
if (4 == ++fCurrX) {
if (3 == ++fCurrX) {
fCurrX = 0;
fCurrY += 1;
if (fCurrY >= 4) {
if (fCurrY >= 3) {
fDone = true;
}
}