Revert to defaultClipBehavior (#20578)
diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index 31a86bc..64198c0 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -3,6 +3,7 @@
// found in the LICENSE file.
import 'dart:math' as math;
+import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -46,7 +47,7 @@
this.constraints = const BoxConstraints(minWidth: 88.0, minHeight: 36.0),
this.shape = const RoundedRectangleBorder(),
this.animationDuration = kThemeChangeDuration,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
MaterialTapTargetSize materialTapTargetSize,
this.child,
}) : this.materialTapTargetSize = materialTapTargetSize ?? MaterialTapTargetSize.padded,
@@ -267,7 +268,7 @@
this.height,
this.padding,
this.materialTapTargetSize,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
@required this.onPressed,
this.child
}) : assert(clipBehavior != null), super(key: key);
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index dc06f8e..199c085 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use
+
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';
@@ -172,7 +174,7 @@
this.textStyle,
this.borderRadius,
this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
this.animationDuration = kThemeChangeDuration,
this.child,
}) : assert(type != null),
@@ -598,7 +600,7 @@
Key key,
@required this.child,
@required this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
@required this.elevation,
@required this.color,
@required this.shadowColor,
diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart
index d57a66f..eb04f9a 100644
--- a/packages/flutter/lib/src/material/outline_button.dart
+++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'dart:ui' as ui show defaultClipBehavior; // ignore: deprecated_member_use
+
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
@@ -68,7 +70,7 @@
this.highlightedBorderColor,
this.padding,
this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
this.child,
}) : assert(highlightElevation != null && highlightElevation >= 0.0),
assert(clipBehavior != null),
@@ -96,7 +98,7 @@
this.disabledBorderColor,
this.highlightedBorderColor,
this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
@required Widget icon,
@required Widget label,
}) : assert(highlightElevation != null && highlightElevation >= 0.0),
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 7b06c05..c76b03e 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'dart:ui' as ui show defaultClipBehavior; // ignore: deprecated_member_use
+
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
@@ -63,7 +65,7 @@
this.disabledElevation = 0.0,
this.padding,
this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
this.materialTapTargetSize,
this.animationDuration = kThemeChangeDuration,
this.child,
@@ -98,7 +100,7 @@
this.highlightElevation = 8.0,
this.disabledElevation = 0.0,
this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
this.materialTapTargetSize,
this.animationDuration = kThemeChangeDuration,
@required Widget icon,
diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart
index f2db334..97d1ad2 100644
--- a/packages/flutter/lib/src/rendering/layer.dart
+++ b/packages/flutter/lib/src/rendering/layer.dart
@@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:collection';
-import 'dart:ui' as ui show Image, ImageFilter, Picture, Scene, SceneBuilder;
+import 'dart:ui' as ui show Image, ImageFilter, Picture, Scene, SceneBuilder, defaultClipBehavior; // ignore: deprecated_member_use
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart';
@@ -970,7 +970,7 @@
/// The [clipPath], [elevation], and [color] arguments must not be null.
PhysicalModelLayer({
@required this.clipPath,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
@required this.elevation,
@required this.color,
@required this.shadowColor,
diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart
index 1505013..aa94774 100644
--- a/packages/flutter/lib/src/rendering/proxy_box.dart
+++ b/packages/flutter/lib/src/rendering/proxy_box.dart
@@ -4,7 +4,7 @@
import 'dart:async';
-import 'dart:ui' as ui show ImageFilter, Gradient, Image;
+import 'dart:ui' as ui show ImageFilter, Gradient, Image, defaultClipBehavior; // ignore: deprecated_member_use
import 'package:flutter/animation.dart';
import 'package:flutter/foundation.dart';
@@ -1501,7 +1501,7 @@
@required double elevation,
@required Color color,
@required Color shadowColor,
- Clip clipBehavior = Clip.none,
+ Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
CustomClipper<T> clipper,
}) : assert(elevation != null),
assert(color != null),
@@ -1580,7 +1580,7 @@
RenderPhysicalModel({
RenderBox child,
BoxShape shape = BoxShape.rectangle,
- Clip clipBehavior = Clip.none,
+ Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
BorderRadius borderRadius,
double elevation = 0.0,
@required Color color,
@@ -1739,7 +1739,7 @@
RenderPhysicalShape({
RenderBox child,
@required CustomClipper<Path> clipper,
- Clip clipBehavior = Clip.none,
+ Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
double elevation = 0.0,
@required Color color,
Color shadowColor = const Color(0xFF000000),
diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart
index ab8da3e..930050c 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:ui' as ui show Image, ImageFilter;
+import 'dart:ui' as ui show Image, ImageFilter, defaultClipBehavior; // ignore: deprecated_member_use
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -711,7 +711,7 @@
const PhysicalModel({
Key key,
this.shape = BoxShape.rectangle,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
this.borderRadius,
this.elevation = 0.0,
@required this.color,
@@ -799,7 +799,7 @@
const PhysicalShape({
Key key,
@required this.clipper,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
this.elevation = 0.0,
@required this.color,
this.shadowColor = const Color(0xFF000000),
diff --git a/packages/flutter/lib/src/widgets/implicit_animations.dart b/packages/flutter/lib/src/widgets/implicit_animations.dart
index 67eb0fc..5c977fb 100644
--- a/packages/flutter/lib/src/widgets/implicit_animations.dart
+++ b/packages/flutter/lib/src/widgets/implicit_animations.dart
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'dart:ui'as ui show defaultClipBehavior; // ignore: deprecated_member_use
+
import 'package:flutter/animation.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -1181,7 +1183,7 @@
Key key,
@required this.child,
@required this.shape,
- this.clipBehavior = Clip.none,
+ this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
this.borderRadius = BorderRadius.zero,
@required this.elevation,
@required this.color,
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 053f525..58f0ce7 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -309,7 +309,7 @@
tester.renderObject(find.byKey(buttonKey)),
paintsExactlyCountTimes(#clipPath, 0)
);
- });
+ }, skip: true);
testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async {
final SemanticsTester semantics = new SemanticsTester(tester);
diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart
index a656f05..4ff6419 100644
--- a/packages/flutter/test/material/material_test.dart
+++ b/packages/flutter/test/material/material_test.dart
@@ -182,7 +182,7 @@
);
expect(find.byKey(materialKey), hasNoImmediateClip);
- });
+ }, skip: true);
testWidgets('clips to bounding rect by default given Clip.antiAlias', (WidgetTester tester) async {
final GlobalKey materialKey = new GlobalKey();
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index 89ad0ae..81ddb1e 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -157,7 +157,7 @@
tester.renderObject(find.byKey(buttonKey)),
paintsExactlyCountTimes(#clipPath, 0)
);
- });
+ }, skip: true);
testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async {
final SemanticsTester semantics = new SemanticsTester(tester);
diff --git a/packages/flutter/test/widgets/clip_test.dart b/packages/flutter/test/widgets/clip_test.dart
index 6ed6a52..9f74953 100644
--- a/packages/flutter/test/widgets/clip_test.dart
+++ b/packages/flutter/test/widgets/clip_test.dart
@@ -534,7 +534,7 @@
find.byType(RepaintBoundary).first,
matchesGoldenFile('clip.PhysicalModel.default.png'),
);
- });
+ }, skip: true);
Center genPhysicalShape(Clip clipBehavior) {
return new Center(
@@ -645,5 +645,5 @@
find.byType(RepaintBoundary).first,
matchesGoldenFile('clip.PhysicalShape.default.png'),
);
- });
+ }, skip: true);
}
