Revert "Use RRects instead of Paths when possible in Material. (#14404)"

This reverts commit d9ef7df978e6d50663a4d100963ec16205f3ab6f.

packages/flutter/lib/src/material/material.dart

@@ -306,14 +306,6 @@ class _MaterialState extends State<Material> with TickerProviderStateMixin {
     if (widget.type == MaterialType.transparency)
       return _clipToShape(shape: shape, contents: contents);
     
-    // PhysicalModel performs better than PhysicalShape, so we use it when
-    // possible.
-    // This is not expected, and we do this as a temporary workaround until the
-    // shape performance regression is resolved, see:
-    // https://github.com/flutter/flutter/issues/14403
-    if (shape.runtimeType == CircleBorder || shape.runtimeType == RoundedRectangleBorder)
-      return _physicalModelInterior(contents, shape, backgroundColor);
-
     return new _MaterialInterior(
       curve: Curves.fastOutSlowIn,
       duration: kThemeChangeDuration,
@@ -323,45 +315,10 @@ class _MaterialState extends State<Material> with TickerProviderStateMixin {
       shadowColor: widget.shadowColor,
       child: contents,
     );
-  }
 
-  Widget _physicalModelInterior(Widget contents, ShapeBorder shape, Color backgroundColor) {
-    assert(shape.runtimeType == CircleBorder || shape.runtimeType == RoundedRectangleBorder);
-    BoxShape boxShape;
-    BorderRadius borderRadius;
-    if (shape.runtimeType == CircleBorder) {
-      boxShape = BoxShape.circle;
-      borderRadius = BorderRadius.zero;
-    } else {
-      final RoundedRectangleBorder border = shape;
-      boxShape = BoxShape.rectangle;
-      borderRadius = border.borderRadius;
-    }
-    return new AnimatedPhysicalModel(
-      curve: Curves.fastOutSlowIn,
-      duration: kThemeChangeDuration,
-      shape: boxShape,
-      borderRadius: borderRadius,
-      elevation: widget.elevation,
-      color: backgroundColor,
-      shadowColor: widget.shadowColor,
-      animateColor: false,
-      child: contents,
-    );
   }
 
   static Widget _clipToShape({ShapeBorder shape, Widget contents}) {
-    // ClipRRect performs better than ClipPath, so we use it when possible.
-    // This is not expected, and we do this as a temporary workaround until the
-    // shape performance regression is resolved, see:
-    // https://github.com/flutter/flutter/issues/14403
-    if (shape.runtimeType == RoundedRectangleBorder) {
-      final RoundedRectangleBorder border = shape;
-      return new ClipRRect(
-        borderRadius: border.borderRadius,
-        child: contents,
-      );
-    }
     return new ClipPath(
       child: contents,
       clipper: new ShapeBorderClipper(

packages/flutter/test/material/ink_well_test.dart

@@ -140,17 +140,17 @@ void main() {
           ),
         ),
       );
-      expect(tester.renderObject<RenderProxyBox>(find.byType(PhysicalModel)).child, paintsNothing);
+      expect(tester.renderObject<RenderProxyBox>(find.byType(PhysicalShape)).child, paintsNothing);
       await tester.tap(find.byType(InkWell));
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 10));
-      expect(tester.renderObject<RenderProxyBox>(find.byType(PhysicalModel)).child, paints..circle());
+      expect(tester.renderObject<RenderProxyBox>(find.byType(PhysicalShape)).child, paints..circle());
       await tester.drag(find.byType(ListView), const Offset(0.0, -1000.0));
       await tester.pump(const Duration(milliseconds: 10));
       await tester.drag(find.byType(ListView), const Offset(0.0, 1000.0));
       await tester.pump(const Duration(milliseconds: 10));
       expect(
-        tester.renderObject<RenderProxyBox>(find.byType(PhysicalModel)).child,
+        tester.renderObject<RenderProxyBox>(find.byType(PhysicalShape)).child,
         keepAlive ? (paints..circle()) : paintsNothing,
       );
     }

packages/flutter/test/material/material_test.dart

@@ -29,8 +29,8 @@ Widget buildMaterial(
   );
 }
 
-RenderPhysicalModel getShadow(WidgetTester tester) {
+RenderPhysicalShape getShadow(WidgetTester tester) {
-  return tester.renderObject(find.byType(PhysicalModel));
+  return tester.renderObject(find.byType(PhysicalShape));
 }
 
 class PaintRecorder extends CustomPainter {
@@ -122,23 +122,23 @@ void main() {
     // a kThemeChangeDuration time interval.
 
     await tester.pumpWidget(buildMaterial(elevation: 0.0));
-    final RenderPhysicalModel modelA = getShadow(tester);
+    final RenderPhysicalShape modelA = getShadow(tester);
     expect(modelA.elevation, equals(0.0));
 
     await tester.pumpWidget(buildMaterial(elevation: 9.0));
-    final RenderPhysicalModel modelB = getShadow(tester);
+    final RenderPhysicalShape modelB = getShadow(tester);
     expect(modelB.elevation, equals(0.0));
 
     await tester.pump(const Duration(milliseconds: 1));
-    final RenderPhysicalModel modelC = getShadow(tester);
+    final RenderPhysicalShape modelC = getShadow(tester);
     expect(modelC.elevation, closeTo(0.0, 0.001));
 
     await tester.pump(kThemeChangeDuration ~/ 2);
-    final RenderPhysicalModel modelD = getShadow(tester);
+    final RenderPhysicalShape modelD = getShadow(tester);
     expect(modelD.elevation, isNot(closeTo(0.0, 0.001)));
 
     await tester.pump(kThemeChangeDuration);
-    final RenderPhysicalModel modelE = getShadow(tester);
+    final RenderPhysicalShape modelE = getShadow(tester);
     expect(modelE.elevation, equals(9.0));
   });
 
@@ -147,23 +147,23 @@ void main() {
     // a kThemeChangeDuration time interval.
 
     await tester.pumpWidget(buildMaterial(shadowColor: const Color(0xFF00FF00)));
-    final RenderPhysicalModel modelA = getShadow(tester);
+    final RenderPhysicalShape modelA = getShadow(tester);
     expect(modelA.shadowColor, equals(const Color(0xFF00FF00)));
 
     await tester.pumpWidget(buildMaterial(shadowColor: const Color(0xFFFF0000)));
-    final RenderPhysicalModel modelB = getShadow(tester);
+    final RenderPhysicalShape modelB = getShadow(tester);
     expect(modelB.shadowColor, equals(const Color(0xFF00FF00)));
 
     await tester.pump(const Duration(milliseconds: 1));
-    final RenderPhysicalModel modelC = getShadow(tester);
+    final RenderPhysicalShape modelC = getShadow(tester);
     expect(modelC.shadowColor, within<Color>(distance: 1, from: const Color(0xFF00FF00)));
 
     await tester.pump(kThemeChangeDuration ~/ 2);
-    final RenderPhysicalModel modelD = getShadow(tester);
+    final RenderPhysicalShape modelD = getShadow(tester);
     expect(modelD.shadowColor, isNot(within<Color>(distance: 1, from: const Color(0xFF00FF00))));
 
     await tester.pump(kThemeChangeDuration);
-    final RenderPhysicalModel modelE = getShadow(tester);
+    final RenderPhysicalShape modelE = getShadow(tester);
     expect(modelE.shadowColor, equals(const Color(0xFFFF0000)));
   });
 
@@ -178,7 +178,7 @@ void main() {
         )
       );
 
-      expect(find.byKey(materialKey), clipsWithBoundingRRect(borderRadius: BorderRadius.zero));
+      expect(find.byKey(materialKey), clipsWithBoundingRect);
     });
 
     testWidgets('clips to rounded rect when borderRadius provided', (WidgetTester tester) async {

packages/flutter/test/rendering/recording_canvas.dart

@@ -110,14 +110,6 @@ class TestRecordingPaintingContext implements PaintingContext {
     canvas.restore();
   }
 
-  @override
-  void pushClipRRect(bool needsCompositing, Offset offset, Rect bounds, RRect clipRRect, PaintingContextCallback painter) {
-    canvas.save();
-    canvas.clipRRect(clipRRect.shift(offset));
-    painter(this, offset);
-    canvas.restore();
-  }
-
   @override
   void pushClipPath(bool needsCompositing, Offset offset, Rect bounds, Path clipPath, PaintingContextCallback painter) {
     canvas