mirror of
https://github.com/flutter/flutter
synced 2024-10-04 15:29:52 +00:00
This reverts commit c567f8439b
.
This commit is contained in:
parent
4533afa5ff
commit
a607a60b4a
|
@ -1764,16 +1764,11 @@ class OpacityLayer extends OffsetLayer {
|
||||||
@override
|
@override
|
||||||
void addToScene(ui.SceneBuilder builder) {
|
void addToScene(ui.SceneBuilder builder) {
|
||||||
assert(alpha != null);
|
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) {
|
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
|
// TODO(dnfield): Remove this if/when we can fix https://github.com/flutter/flutter/issues/90004
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(() {
|
assert(() {
|
||||||
enabled = enabled && !debugDisableOpacityLayers;
|
enabled = enabled && !debugDisableOpacityLayers;
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -637,21 +637,6 @@ void main() {
|
||||||
expect(builder.addedPicture, true);
|
expect(builder.addedPicture, true);
|
||||||
expect(layer.engineLayer, isA<FakeOpacityEngineLayer>());
|
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 {
|
class FakeEngineLayer extends Fake implements EngineLayer {
|
||||||
|
|
Loading…
Reference in a new issue