Skip to content

F
Front-End
Unverified Commit 8147bdbb authored by Jonah Williams's avatar Jonah Williams Committed by GitHub
Browse files
Options

partial revert of repaint boundary change (#102962)

parent d5ac8eea
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 282 deletions
packages/flutter/lib/src/rendering/proxy_box.dart
View file @ 8147bdbb
...@@ -843,7 +843,7 @@ class RenderOpacity extends RenderProxyBox { ...@@ -843,7 +843,7 @@ class RenderOpacity extends RenderProxyBox {
super(child); super(child);
@override @override
bool get isRepaintBoundary => child != null && (_alpha > 0); bool get alwaysNeedsCompositing => child != null && (_alpha > 0);
@override @override
OffsetLayer updateCompositedLayer({required covariant OpacityLayer? oldLayer}) { OffsetLayer updateCompositedLayer({required covariant OpacityLayer? oldLayer}) {
...@@ -871,13 +871,13 @@ class RenderOpacity extends RenderProxyBox { ...@@ -871,13 +871,13 @@ class RenderOpacity extends RenderProxyBox {
assert(value >= 0.0 && value <= 1.0); assert(value >= 0.0 && value <= 1.0);
if (_opacity == value) if (_opacity == value)
return; return;
final bool wasRepaintBoundary = isRepaintBoundary; final bool didNeedCompositing = alwaysNeedsCompositing;
final bool wasVisible = _alpha != 0; final bool wasVisible = _alpha != 0;
_opacity = value; _opacity = value;
_alpha = ui.Color.getAlphaFromOpacity(_opacity); _alpha = ui.Color.getAlphaFromOpacity(_opacity);
if (wasRepaintBoundary != isRepaintBoundary) if (didNeedCompositing != alwaysNeedsCompositing)
markNeedsCompositingBitsUpdate(); markNeedsCompositingBitsUpdate();
markNeedsCompositedLayerUpdate(); markNeedsPaint();
if (wasVisible != (_alpha != 0) && !alwaysIncludeSemantics) if (wasVisible != (_alpha != 0) && !alwaysIncludeSemantics)
markNeedsSemanticsUpdate(); markNeedsSemanticsUpdate();
} }
...@@ -898,10 +898,19 @@ class RenderOpacity extends RenderProxyBox { ...@@ -898,10 +898,19 @@ class RenderOpacity extends RenderProxyBox {
@override @override
void paint(PaintingContext context, Offset offset) { void paint(PaintingContext context, Offset offset) {
if (_alpha == 0) { if (child != null) {
return; if (_alpha == 0) {
// No need to keep the layer. We'll create a new one if necessary.
layer = null;
return;
}
assert(needsCompositing);
layer = context.pushOpacity(offset, _alpha, super.paint, oldLayer: layer as OpacityLayer?);
assert(() {
layer!.debugCreator = debugCreator;
return true;
}());
} }
super.paint(context, offset);
} }
@override @override
......
packages/flutter/test/widgets/opacity_repaint_test.dart deleted 100644 → 0
View file @ d5ac8eea
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
testWidgets('RenderOpacity acts as a repaint boundary for changes above the widget when partially opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity acts as a repaint boundary for changes above the widget when fully opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 1,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 1,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity can update its opacity without repainting its child - partially opaque to partially opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0.9,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity can update its opacity without repainting its child - partially opaque to fully opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 1,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity can update its opacity without repainting its child - fully opaque to partially opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 1,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity can update its opacity without repainting its child - fully opaque to fully transparent', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 1,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity must paint child - fully transparent to partially opaque', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 0,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 0);
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity allows child to update without updating parent', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
TestWidget(
child: Opacity(
opacity: 0.5,
child: Container(
color: Colors.red,
),
),
)
);
expect(RenderTestObject.paintCount, 1);
await tester.pumpWidget(
TestWidget(
child: Opacity(
opacity: 0.5,
child: Container(
color: Colors.blue,
),
),
)
);
expect(RenderTestObject.paintCount, 1);
});
testWidgets('RenderOpacity disposes of opacity layer when opacity is updated to 0', (WidgetTester tester) async {
RenderTestObject.paintCount = 0;
await tester.pumpWidget(
Container(
color: Colors.red,
child: const Opacity(
opacity: 0.5,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
expect(tester.layers, contains(isA<OpacityLayer>()));
await tester.pumpWidget(
Container(
color: Colors.blue,
child: const Opacity(
opacity: 0,
child: TestWidget(),
),
)
);
expect(RenderTestObject.paintCount, 1);
expect(tester.layers, isNot(contains(isA<OpacityLayer>())));
});
}
class TestWidget extends SingleChildRenderObjectWidget {
const TestWidget({super.key, super.child});
@override
RenderObject createRenderObject(BuildContext context) {
return RenderTestObject();
}
}
class RenderTestObject extends RenderProxyBox {
static int paintCount = 0;
@override
void paint(PaintingContext context, Offset offset) {
paintCount += 1;
super.paint(context, offset);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab