Skip to content

Commit 549b412

Browse files
author
Jonah Williams
authored
Revert "Add more asserts to check matrix validity (#31701)" (#32496)
1 parent 0dc290c commit 549b412

3 files changed

Lines changed: 6 additions & 16 deletions

File tree

‎packages/flutter/lib/src/rendering/layer.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,8 +1228,7 @@ class TransformLayer extends OffsetLayer {
12281228
/// The [transform] and [offset] properties must be non-null before the
12291229
/// compositing phase of the pipeline.
12301230
TransformLayer({ Matrix4 transform, Offset offset = Offset.zero })
1231-
: assert(transform.storage.every((double value) => value.isFinite)),
1232-
_transform = transform,
1231+
: _transform = transform,
12331232
super(offset: offset);
12341233

12351234
/// The matrix to apply.

‎packages/flutter/lib/src/rendering/proxy_box.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,11 +2280,9 @@ class RenderFittedBox extends RenderProxyBox {
22802280
final Rect sourceRect = _resolvedAlignment.inscribe(sizes.source, Offset.zero & childSize);
22812281
final Rect destinationRect = _resolvedAlignment.inscribe(sizes.destination, Offset.zero & size);
22822282
_hasVisualOverflow = sourceRect.width < childSize.width || sourceRect.height < childSize.height;
2283-
assert(scaleX.isFinite && scaleY.isFinite);
22842283
_transform = Matrix4.translationValues(destinationRect.left, destinationRect.top, 0.0)
22852284
..scale(scaleX, scaleY, 1.0)
22862285
..translate(-sourceRect.left, -sourceRect.top);
2287-
assert(_transform.storage.every((double value) => value.isFinite));
22882286
}
22892287
}
22902288

@@ -2298,7 +2296,7 @@ class RenderFittedBox extends RenderProxyBox {
22982296

22992297
@override
23002298
void paint(PaintingContext context, Offset offset) {
2301-
if (size.isEmpty || child.size.isEmpty)
2299+
if (size.isEmpty)
23022300
return;
23032301
_updatePaintData();
23042302
if (child != null) {

‎packages/flutter/test/rendering/proxy_box_test.dart‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,25 @@ import '../flutter_test_alternative.dart';
1515
import 'rendering_tester.dart';
1616

1717
void main() {
18-
test('RenderFittedBox does not paint with empty sizes', () {
18+
test('RenderFittedBox paint', () {
1919
bool painted;
20-
RenderFittedBox makeFittedBox(Size size) {
20+
RenderFittedBox makeFittedBox() {
2121
return RenderFittedBox(
2222
child: RenderCustomPaint(
23-
preferredSize: size,
2423
painter: TestCallbackPainter(onPaint: () {
2524
painted = true;
2625
}),
2726
),
2827
);
2928
}
3029

31-
// The RenderFittedBox paints if both its size and its child's size are nonempty.
3230
painted = false;
33-
layout(makeFittedBox(Size(1, 1)), phase: EnginePhase.paint);
31+
layout(makeFittedBox(), phase: EnginePhase.paint);
3432
expect(painted, equals(true));
3533

36-
// The RenderFittedBox should not paint if its child is empty-sized.
37-
painted = false;
38-
layout(makeFittedBox(Size.zero), phase: EnginePhase.paint);
39-
expect(painted, equals(false));
40-
4134
// The RenderFittedBox should not paint if it is empty.
4235
painted = false;
43-
layout(makeFittedBox(Size(1, 1)), constraints: BoxConstraints.tight(Size.zero), phase: EnginePhase.paint);
36+
layout(makeFittedBox(), constraints: BoxConstraints.tight(Size.zero), phase: EnginePhase.paint);
4437
expect(painted, equals(false));
4538
});
4639

0 commit comments

Comments
 (0)