Set the default clip to Clip.none again. (#20752)
This reverts commit 8de0e15e4fdd3a1be8878394a7f8c8bda948e59b and
updates the goldens versoin.
This requires https://github.com/flutter/flutter/pull/20751 to
land first.
diff --git a/bin/internal/goldens.version b/bin/internal/goldens.version
index f756bbe..a216507 100644
--- a/bin/internal/goldens.version
+++ b/bin/internal/goldens.version
@@ -1 +1 @@
-cc98e28c974eea0bd9a8e24591857ae6b5479795
+1a999092d10a22bc700214b257cd4890c5800078
diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
index bf6c743..f9f01d4 100644
--- a/packages/flutter/lib/src/material/button.dart
+++ b/packages/flutter/lib/src/material/button.dart
@@ -3,7 +3,6 @@
// 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';
@@ -47,7 +46,7 @@
this.constraints = const BoxConstraints(minWidth: 88.0, minHeight: 36.0),
this.shape = const RoundedRectangleBorder(),
this.animationDuration = kThemeChangeDuration,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
MaterialTapTargetSize materialTapTargetSize,
this.child,
}) : this.materialTapTargetSize = materialTapTargetSize ?? MaterialTapTargetSize.padded,
@@ -269,7 +268,7 @@
this.height,
this.padding,
this.materialTapTargetSize,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
@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 199c085..dc06f8e 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -2,8 +2,6 @@
// 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';
@@ -174,7 +172,7 @@
this.textStyle,
this.borderRadius,
this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
+ this.clipBehavior = Clip.none,
this.animationDuration = kThemeChangeDuration,
this.child,
}) : assert(type != null),
@@ -600,7 +598,7 @@
Key key,
@required this.child,
@required this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
+ this.clipBehavior = Clip.none,
@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 eb04f9a..d57a66f 100644
--- a/packages/flutter/lib/src/material/outline_button.dart
+++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -2,8 +2,6 @@
// 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';
@@ -70,7 +68,7 @@
this.highlightedBorderColor,
this.padding,
this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
this.child,
}) : assert(highlightElevation != null && highlightElevation >= 0.0),
assert(clipBehavior != null),
@@ -98,7 +96,7 @@
this.disabledBorderColor,
this.highlightedBorderColor,
this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
@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 c76b03e..7b06c05 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -2,8 +2,6 @@
// 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';
@@ -65,7 +63,7 @@
this.disabledElevation = 0.0,
this.padding,
this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
+ this.clipBehavior = Clip.none,
this.materialTapTargetSize,
this.animationDuration = kThemeChangeDuration,
this.child,
@@ -100,7 +98,7 @@
this.highlightElevation = 8.0,
this.disabledElevation = 0.0,
this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use
+ this.clipBehavior = Clip.none,
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 97d1ad2..f2db334 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, defaultClipBehavior; // ignore: deprecated_member_use
+import 'dart:ui' as ui show Image, ImageFilter, Picture, Scene, SceneBuilder;
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 = ui.defaultClipBehavior, // ignore: deprecated_member_use
+ this.clipBehavior = Clip.none,
@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 78f3eda..086f2a3 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, defaultClipBehavior; // ignore: deprecated_member_use
+import 'dart:ui' as ui show ImageFilter, Gradient, Image;
import 'package:flutter/animation.dart';
import 'package:flutter/foundation.dart';
@@ -1500,7 +1500,7 @@
@required double elevation,
@required Color color,
@required Color shadowColor,
- Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ Clip clipBehavior = Clip.none,
CustomClipper<T> clipper,
}) : assert(elevation != null),
assert(color != null),
@@ -1579,7 +1579,7 @@
RenderPhysicalModel({
RenderBox child,
BoxShape shape = BoxShape.rectangle,
- Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ Clip clipBehavior = Clip.none,
BorderRadius borderRadius,
double elevation = 0.0,
@required Color color,
@@ -1738,7 +1738,7 @@
RenderPhysicalShape({
RenderBox child,
@required CustomClipper<Path> clipper,
- Clip clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ Clip clipBehavior = Clip.none,
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 8e57eb2..3c772a0 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, defaultClipBehavior; // ignore: deprecated_member_use
+import 'dart:ui' as ui show Image, ImageFilter;
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
@@ -711,7 +711,7 @@
const PhysicalModel({
Key key,
this.shape = BoxShape.rectangle,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
this.borderRadius,
this.elevation = 0.0,
@required this.color,
@@ -799,7 +799,7 @@
const PhysicalShape({
Key key,
@required this.clipper,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
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 5c977fb..67eb0fc 100644
--- a/packages/flutter/lib/src/widgets/implicit_animations.dart
+++ b/packages/flutter/lib/src/widgets/implicit_animations.dart
@@ -2,8 +2,6 @@
// 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';
@@ -1183,7 +1181,7 @@
Key key,
@required this.child,
@required this.shape,
- this.clipBehavior = ui.defaultClipBehavior, // ignore: deprecated_member_use,
+ this.clipBehavior = Clip.none,
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 6279776..7209d48 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -308,7 +308,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 4ff6419..a656f05 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 3838518..ee9e3bd 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 9f74953..6ed6a52 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);
+ });
}
