firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reland "Ensure the engineLayer is disposed when an OpacityLayer is disabled"" (#96295)

Browse Source
This commit is contained in:
Dan Field 2022-01-07 10:55:05 -08:00 committed by GitHub
parent bb65333c10
commit fa8e3e6877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter/lib/src/rendering/layer.dart
View File

@ -1763,11 +1763,16 @@ class OpacityLayer extends OffsetLayer {
@override
void addToScene(ui.SceneBuilder builder) {
assert(alpha != null);
bool enabled = firstChild != null; // don't add this layer if there's no child
// Don't add this layer if there's no child.
bool enabled = firstChild != null;
if (!enabled) {
// Ensure the engineLayer is disposed.
engineLayer = null;
// TODO(dnfield): Remove this if/when we can fix https://github.com/flutter/flutter/issues/90004
return;
}
assert(() {
enabled = enabled && !debugDisableOpacityLayers;
return true;

15
packages/flutter/test/rendering/layers_test.dart
View File

@ -637,6 +637,21 @@ void main() {
expect(builder.addedPicture, true);
expect(layer.engineLayer, isA<FakeOpacityEngineLayer>());
});
test('OpacityLayer dispose its engineLayer if there are no children', () {
final OpacityLayer layer = OpacityLayer(alpha: 128);
final FakeSceneBuilder builder = FakeSceneBuilder();
layer.addToScene(builder);
expect(layer.engineLayer, null);
layer.append(PictureLayer(Rect.largest)..picture = FakePicture());
layer.addToScene(builder);
expect(layer.engineLayer, isA<FakeOpacityEngineLayer>());
layer.removeAllChildren();
layer.addToScene(builder);
expect(layer.engineLayer, null);
});
}
class FakeEngineLayer extends Fake implements EngineLayer {