From c504797c423f22d6a9d38b23c426cb37914b288b Mon Sep 17 00:00:00 2001
From: Taha Tesser <tessertaha@gmail.com>
Date: Fri, 18 Feb 2022 11:29:16 +0200
Subject: [PATCH] Remove `clipBehavior == Clip.none` conditions (#98503)

---
 packages/flutter/lib/src/cupertino/form_section.dart | 12 +++++-------
 packages/flutter/lib/src/material/material.dart      |  3 ---
 .../flutter/lib/src/widgets/interactive_viewer.dart  | 12 ++++--------
 .../flutter/test/cupertino/form_section_test.dart    |  4 +++-
 packages/flutter/test/material/material_test.dart    |  3 ++-
 .../test/widgets/interactive_viewer_test.dart        |  7 +++----
 6 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/packages/flutter/lib/src/cupertino/form_section.dart b/packages/flutter/lib/src/cupertino/form_section.dart
index 44e4d1e431..710d124f9d 100644
--- a/packages/flutter/lib/src/cupertino/form_section.dart
+++ b/packages/flutter/lib/src/cupertino/form_section.dart
@@ -293,13 +293,11 @@ class CupertinoFormSection extends StatelessWidget {
             ),
           Padding(
             padding: margin,
-            child: clipBehavior == Clip.none
-              ? decoratedChildrenGroup
-              : ClipRRect(
-                  borderRadius: childrenGroupBorderRadius,
-                  clipBehavior: clipBehavior,
-                  child: decoratedChildrenGroup,
-                ),
+            child: ClipRRect(
+              borderRadius: childrenGroupBorderRadius,
+              clipBehavior: clipBehavior,
+              child: decoratedChildrenGroup,
+            ),
           ),
           if (footer != null)
             Align(
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index 12dd8f4870..f6fd6fb3bd 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -450,9 +450,6 @@ class _MaterialState extends State<Material> with TickerProviderStateMixin {
       shape: shape,
       child: contents,
     );
-    if (clipBehavior == Clip.none) {
-      return child;
-    }
     return ClipPath(
       clipper: ShapeBorderClipper(
         shape: shape,
diff --git a/packages/flutter/lib/src/widgets/interactive_viewer.dart b/packages/flutter/lib/src/widgets/interactive_viewer.dart
index 5ab1498702..496f255e00 100644
--- a/packages/flutter/lib/src/widgets/interactive_viewer.dart
+++ b/packages/flutter/lib/src/widgets/interactive_viewer.dart
@@ -1103,14 +1103,10 @@ class _InteractiveViewerBuilt extends StatelessWidget {
       );
     }
 
-    if (clipBehavior != Clip.none) {
-      child = ClipRect(
-        clipBehavior: clipBehavior,
-        child: child,
-      );
-    }
-
-    return child;
+    return ClipRect(
+      clipBehavior: clipBehavior,
+      child: child,
+    );
   }
 }
 
diff --git a/packages/flutter/test/cupertino/form_section_test.dart b/packages/flutter/test/cupertino/form_section_test.dart
index 2240871c5c..7aced4365b 100644
--- a/packages/flutter/test/cupertino/form_section_test.dart
+++ b/packages/flutter/test/cupertino/form_section_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -163,6 +164,7 @@ void main() {
       ),
     );
 
-    expect(find.byType(ClipRRect), findsNothing);
+    final RenderClipRRect renderClip = tester.allRenderObjects.whereType<RenderClipRRect>().first;
+    expect(renderClip.clipBehavior, equals(Clip.none));
   });
 }
diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart
index 591518cea7..b50431b5de 100644
--- a/packages/flutter/test/material/material_test.dart
+++ b/packages/flutter/test/material/material_test.dart
@@ -420,7 +420,8 @@ void main() {
           ),
       );
 
-      expect(find.byKey(materialKey), hasNoImmediateClip);
+      final RenderClipPath renderClip = tester.allRenderObjects.whereType<RenderClipPath>().first;
+      expect(renderClip.clipBehavior, equals(Clip.none));
     });
 
     testWidgets('clips to bounding rect by default given Clip.antiAlias', (WidgetTester tester) async {
diff --git a/packages/flutter/test/widgets/interactive_viewer_test.dart b/packages/flutter/test/widgets/interactive_viewer_test.dart
index a9764e2b60..21269fcb91 100644
--- a/packages/flutter/test/widgets/interactive_viewer_test.dart
+++ b/packages/flutter/test/widgets/interactive_viewer_test.dart
@@ -6,6 +6,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vector_math/vector_math_64.dart' show Quad, Vector3, Matrix4;
 
@@ -1168,10 +1169,8 @@ void main() {
         ),
       );
 
-      expect(
-        find.byType(ClipRect),
-        findsNothing,
-      );
+      final RenderClipRect renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
+      expect(renderClip.clipBehavior, equals(Clip.none));
 
       await tester.pumpWidget(
         MaterialApp(