diff options
author | Robert Phillips <robertphillips@google.com> | 2017-03-31 10:03:45 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:11:30 +0000 |
commit | f7a7261b4ac23f97580a8ff6f0307b3c47399b9d (patch) | |
tree | 3d50ff5737ce2dd1f45c05b3de6814ec6a589d59 /include/core | |
parent | 9bd301d640ff63c280b202c7dd00bc00a3315ff4 (diff) |
Add tracking of unique proxyID beside unique renderTargetID in auditTrail and clearOp
Split out of: https://skia-review.googlesource.com/c/10284/ (Omnibus: Remove GrSurface-derived classes from ops)
Change-Id: I5845a47d94decc455ec3b1f0a5876b1c82aa32e8
Reviewed-on: https://skia-review.googlesource.com/10750
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/core')
-rw-r--r-- | include/core/SkRect.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkRect.h b/include/core/SkRect.h index bcdc4f147b..b8cf846404 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -327,8 +327,7 @@ struct SK_API SkIRect { otherwise return false and do not change this rectangle. If either rectangle is empty, do nothing and return false. */ - bool intersect(int32_t left, int32_t top, - int32_t right, int32_t bottom) { + bool intersect(int32_t left, int32_t top, int32_t right, int32_t bottom) { if (left < right && top < bottom && !this->isEmpty() && fLeft < right && left < fRight && fTop < bottom && top < fBottom) { if (fLeft < left) fLeft = left; |