| Index: src/core/SkRect.cpp
|
| diff --git a/src/core/SkRect.cpp b/src/core/SkRect.cpp
|
| index 3cff5d81e5afc2d0f1e53340cfc13ede19f9df31..2814375abba05bdfdaa1ae68832a09f1e69b71e3 100644
|
| --- a/src/core/SkRect.cpp
|
| +++ b/src/core/SkRect.cpp
|
| @@ -114,12 +114,10 @@ bool SkRect::intersect(SkScalar left, SkScalar top, SkScalar right,
|
| }
|
|
|
| bool SkRect::intersect(const SkRect& r) {
|
| - SkASSERT(&r);
|
| return this->intersect(r.fLeft, r.fTop, r.fRight, r.fBottom);
|
| }
|
|
|
| bool SkRect::intersect2(const SkRect& r) {
|
| - SkASSERT(&r);
|
| SkScalar L = SkMaxScalar(fLeft, r.fLeft);
|
| SkScalar R = SkMinScalar(fRight, r.fRight);
|
| if (L >= R) {
|
| @@ -135,7 +133,6 @@ bool SkRect::intersect2(const SkRect& r) {
|
| }
|
|
|
| bool SkRect::intersect(const SkRect& a, const SkRect& b) {
|
| - SkASSERT(&a && &b);
|
|
|
| if (!a.isEmpty() && !b.isEmpty() &&
|
| a.fLeft < b.fRight && b.fLeft < a.fRight &&
|
|
|