Don't canonicalize empty SkRRects. They stroke differently.

Make insetting greater than width or height collapse to a point/line.

SkPath::addRRect() doesn't ignore an empty SkRRect.


Change-Id: I933a3419a6d75be534f1d8328faa715772045f67
Reviewed-on: https://skia-review.googlesource.com/85680
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 88ca3f8f05..4bb8c88ae1 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -3662,7 +3662,10 @@ static void test_rrect(skiatest::Reporter* reporter) {
     SkRect emptyR = {10, 20, 10, 30};
     rr.setRectRadii(emptyR, radii);
     p.addRRect(rr);
-    REPORTER_ASSERT(reporter, p.isEmpty());
+    // The round rect is "empty" in that it has no fill area. However,
+    // the path isn't "empty" in that it should have verbs and points.
+    REPORTER_ASSERT(reporter, !p.isEmpty());
+    p.reset();
     SkRect largeR = {0, 0, SK_ScalarMax, SK_ScalarMax};
     rr.setRectRadii(largeR, radii);
     p.addRRect(rr);
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 43a51430ab..a32e347b6f 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -71,36 +71,51 @@ static void test_empty(skiatest::Reporter* reporter) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(oooRects); ++i) {
         r.setRect(oooRects[i]);
         REPORTER_ASSERT(reporter, !r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == oooRects[i].makeSorted());
 
         r.setOval(oooRects[i]);
         REPORTER_ASSERT(reporter, !r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == oooRects[i].makeSorted());
 
         r.setRectXY(oooRects[i], 1, 2);
         REPORTER_ASSERT(reporter, !r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == oooRects[i].makeSorted());
 
         r.setNinePatch(oooRects[i], 0, 1, 2, 3);
         REPORTER_ASSERT(reporter, !r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == oooRects[i].makeSorted());
 
         r.setRectRadii(oooRects[i], radii);
         REPORTER_ASSERT(reporter, !r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == oooRects[i].makeSorted());
     }
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(emptyRects); ++i) {
         r.setRect(emptyRects[i]);
         REPORTER_ASSERT(reporter, r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == emptyRects[i]);
 
         r.setOval(emptyRects[i]);
         REPORTER_ASSERT(reporter, r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == emptyRects[i]);
 
         r.setRectXY(emptyRects[i], 1, 2);
         REPORTER_ASSERT(reporter, r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == emptyRects[i]);
 
         r.setNinePatch(emptyRects[i], 0, 1, 2, 3);
         REPORTER_ASSERT(reporter, r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == emptyRects[i]);
 
         r.setRectRadii(emptyRects[i], radii);
         REPORTER_ASSERT(reporter, r.isEmpty());
+        REPORTER_ASSERT(reporter, r.rect() == emptyRects[i]);
     }
+
+    r.setRect({SK_ScalarNaN, 10, 10, 20});
+    REPORTER_ASSERT(reporter, r == SkRRect::MakeEmpty());
+    r.setRect({0, 10, 10, SK_ScalarInfinity});
+    REPORTER_ASSERT(reporter, r == SkRRect::MakeEmpty());
 }
 
 static const SkScalar kWidth = 100.0f;