finish off unit tests

Author: flar

display_list/benchmarking/dl_complexity_gl.cc

@@ -257,7 +257,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawRoundRect(
   // approximately matching the measured data, normalising the data so that
   // 0.0005ms resulted in a score of 100 then simplifying down the formula.
   if (DrawStyle() == DlDrawStyle::kFill ||
-      ((rrect.GetRadii().AreAllSame()) && IsAntiAliased())) {
+      ((rrect.GetRadii().AreAllCornersSame()) && IsAntiAliased())) {
     unsigned int area = rrect.GetBounds().Area();
     // m = 1/3200
     // c = 0.5
@@ -309,7 +309,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawDiffRoundRect(
   // currently use it anywhere in Flutter.
   if (DrawStyle() == DlDrawStyle::kFill) {
     unsigned int area = outer.GetBounds().Area();
-    if (!outer.GetRadii().AreAllSame()) {
+    if (!outer.GetRadii().AreAllCornersSame()) {
       // m = 1/500
       // c = 0.5
       complexity = (area + 250) / 5;

display_list/benchmarking/dl_complexity_metal.cc

@@ -255,7 +255,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawRoundRect(
   //
   // Expensive: All filled style, symmetric w/AA.
   bool expensive = (DrawStyle() == DlDrawStyle::kFill) ||
-                   (rrect.GetRadii().AreAllSame() && IsAntiAliased());
+                   (rrect.GetRadii().AreAllCornersSame() && IsAntiAliased());
 
   unsigned int complexity;
 
@@ -305,7 +305,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawDiffRoundRect(
   // currently use it anywhere in Flutter.
   if (DrawStyle() == DlDrawStyle::kFill) {
     unsigned int area = outer.GetBounds().Area();
-    if (!outer.GetRadii().AreAllSame()) {
+    if (!outer.GetRadii().AreAllCornersSame()) {
       // m = 1/1000
       // c = 1
       complexity = (area + 1000) / 10;

display_list/utils/dl_matrix_clip_tracker.cc

@@ -312,7 +312,7 @@ bool DisplayListMatrixClipState::rrect_covers_cull(
   if (content.IsOval()) {
     return oval_covers_cull(content.GetBounds());
   }
-  if (!content.GetRadii().AreAllSame()) {
+  if (!content.GetRadii().AreAllCornersSame()) {
     return false;
   }
   DlPoint corners[4];

display_list/utils/dl_matrix_clip_tracker_unittests.cc

@@ -938,7 +938,7 @@ TEST(DisplayListMatrixClipState, RRectCoverage) {
   // Expanded by 2.0 and then with a corner of 2.0 obviously still covers
   EXPECT_TRUE(state.rrect_covers_cull(SkRRect::MakeRectXY(test, 2.0f, 2.0f)));
   // The corner point of the cull rect is at (c-2, c-2) relative to the
-  // corner of the rrect bounds so we compute its disance to the center
+  // corner of the rrect bounds so we compute its distance to the center
   // of the circular part and compare it to the radius of the corner (c)
   // to find the corner radius where it will start to leave the rounded
   // rectangle:

impeller/display_list/canvas.cc

@@ -612,7 +612,7 @@ void Canvas::DrawOval(const Rect& rect, const Paint& paint) {
 void Canvas::DrawRoundRect(const RoundRect& round_rect, const Paint& paint) {
   auto& rect = round_rect.GetBounds();
   auto& radii = round_rect.GetRadii();
-  if (radii.AreAllSame()) {
+  if (radii.AreAllCornersSame()) {
     if (AttemptDrawBlurredRRect(rect, radii.top_left, paint)) {
       return;
     }

impeller/display_list/dl_dispatcher.cc

@@ -458,7 +458,7 @@ void DlDispatcherBase::clipRoundRect(const DlRoundRect& rrect,
     GetCanvas().ClipGeometry(Geometry::MakeRect(rrect.GetBounds()), clip_op);
   } else if (rrect.IsOval()) {
     GetCanvas().ClipGeometry(Geometry::MakeOval(rrect.GetBounds()), clip_op);
-  } else if (rrect.GetRadii().AreAllSame()) {
+  } else if (rrect.GetRadii().AreAllCornersSame()) {
     GetCanvas().ClipGeometry(
         Geometry::MakeRoundRect(rrect.GetBounds(), rrect.GetRadii().top_left),
         clip_op);
@@ -585,13 +585,7 @@ void DlDispatcherBase::drawCircle(const DlPoint& center, DlScalar radius) {
 void DlDispatcherBase::drawRoundRect(const DlRoundRect& rrect) {
   AUTO_DEPTH_WATCHER(1u);
 
-  if (rrect.GetRadii().AreAllSame()) {
-    GetCanvas().DrawRoundRect(rrect, paint_);
-  } else {
-    PathBuilder builder;
-    builder.AddRoundRect(rrect);
-    GetCanvas().DrawPath(builder.TakePath(), paint_);
-  }
+  GetCanvas().DrawRoundRect(rrect, paint_);
 }
 
 // |flutter::DlOpReceiver|

impeller/geometry/path_builder.cc

@@ -142,7 +142,7 @@ PathBuilder& PathBuilder::AddCircle(const Point& c, Scalar r) {
 PathBuilder& PathBuilder::AddRoundRect(RoundRect round_rect) {
   auto rect = round_rect.GetBounds();
   auto radii = round_rect.GetRadii();
-  if (radii.AreAllEmpty()) {
+  if (radii.AreAllCornersEmpty()) {
     return AddRect(rect);
   }
 

impeller/geometry/round_rect.cc

@@ -25,10 +25,9 @@ static inline void AdjustScale(Scalar& radius1,
 
 RoundRect RoundRect::MakeRectRadii(const Rect& bounds,
                                    const RoundingRadii& in_radii) {
-  if (bounds.IsEmpty() || !bounds.IsFinite()) {
-    return RoundRect();
-  }
-  if (in_radii.AreAllEmpty() || !in_radii.IsFinite()) {
+  if (bounds.IsEmpty() || !bounds.IsFinite() ||  //
+      in_radii.AreAllCornersEmpty() || !in_radii.IsFinite()) {
+    // preserve the empty bounds as they might be strokable
     return RoundRect(bounds, RoundingRadii());
   }
 

impeller/geometry/round_rect.h

@@ -32,17 +32,20 @@ struct RoundingRadii {
            bottom_right.IsFinite();
   }
 
-  constexpr bool AreAllEmpty() const {
+  constexpr bool AreAllCornersEmpty() const {
     return top_left.IsEmpty() &&     //
            top_right.IsEmpty() &&    //
            bottom_left.IsEmpty() &&  //
            bottom_right.IsEmpty();
   }
 
-  constexpr bool AreAllSame() const {
-    return top_left == top_right &&    //
-           top_left == bottom_left &&  //
-           top_left == bottom_right;
+  constexpr bool AreAllCornersSame(Scalar tolerance = kEhCloseEnough) const {
+    return ScalarNearlyEqual(top_left.width, top_right.width, tolerance) &&
+           ScalarNearlyEqual(top_left.width, bottom_right.width, tolerance) &&
+           ScalarNearlyEqual(top_left.width, bottom_left.width, tolerance) &&
+           ScalarNearlyEqual(top_left.height, top_right.height, tolerance) &&
+           ScalarNearlyEqual(top_left.height, bottom_right.height, tolerance) &&
+           ScalarNearlyEqual(top_left.height, bottom_left.height, tolerance);
   }
 
   constexpr inline RoundingRadii operator*(Scalar scale) {
@@ -108,11 +111,11 @@ struct RoundRect {
   [[nodiscard]] constexpr bool IsEmpty() const { return bounds_.IsEmpty(); }
 
   [[nodiscard]] constexpr bool IsRect() const {
-    return !bounds_.IsEmpty() && radii_.AreAllEmpty();
+    return !bounds_.IsEmpty() && radii_.AreAllCornersEmpty();
   }
 
   [[nodiscard]] constexpr bool IsOval() const {
-    return !bounds_.IsEmpty() && radii_.AreAllSame() &&
+    return !bounds_.IsEmpty() && radii_.AreAllCornersSame() &&
            ScalarNearlyEqual(radii_.top_left.width,
                              bounds_.GetWidth() * 0.5f) &&
            ScalarNearlyEqual(radii_.top_left.height,