From a607a60b4ac627d0d09d51a92f3d52cd42f4b239 Mon Sep 17 00:00:00 2001
From: Ren You <renyou@google.com>
Date: Mon, 6 Dec 2021 12:05:50 -0800
Subject: [PATCH] Revert "Ensure the engineLayer is disposed when an
 OpacityLayer is disabled (#94280)" (#94743)

This reverts commit c567f8439bcc7728fad5480848b2e2b2ff429df2.
---
 packages/flutter/lib/src/rendering/layer.dart    |  7 +------
 packages/flutter/test/rendering/layers_test.dart | 15 ---------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart
index 7c617b43cf..711303dc8e 100644
--- a/packages/flutter/lib/src/rendering/layer.dart
+++ b/packages/flutter/lib/src/rendering/layer.dart
@@ -1764,16 +1764,11 @@ class OpacityLayer extends OffsetLayer {
   @override
   void addToScene(ui.SceneBuilder builder) {
     assert(alpha != null);
-
-    // Don't add this layer if there's no child.
-    bool enabled = firstChild != null;
+    bool enabled = firstChild != null;  // don't add this layer if there's no child
     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;
diff --git a/packages/flutter/test/rendering/layers_test.dart b/packages/flutter/test/rendering/layers_test.dart
index 1d9aa4a816..8d4e2dcede 100644
--- a/packages/flutter/test/rendering/layers_test.dart
+++ b/packages/flutter/test/rendering/layers_test.dart
@@ -637,21 +637,6 @@ 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 {