Revert "Introduce the PipelineOwner tree (flutter#122231)" (flutter#1…

…22425) This reverts commit f73c358.
hangyujin · Mar 11, 2023 · 145f811 · 145f811
1 parent 9165d12
commit 145f811
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1,341 deletions.
diff --git a/packages/flutter/lib/src/rendering/binding.dart b/packages/flutter/lib/src/rendering/binding.dart
@@ -30,6 +30,7 @@ mixin RendererBinding on BindingBase, ServicesBinding, SchedulerBinding, Gesture
     super.initInstances();
     _instance = this;
     _pipelineOwner = PipelineOwner(
+      onNeedVisualUpdate: ensureVisualUpdate,
       onSemanticsOwnerCreated: _handleSemanticsOwnerCreated,
       onSemanticsUpdate: _handleSemanticsUpdate,
       onSemanticsOwnerDisposed: _handleSemanticsOwnerDisposed,
@@ -44,7 +45,8 @@ mixin RendererBinding on BindingBase, ServicesBinding, SchedulerBinding, Gesture
     if (kIsWeb) {
       addPostFrameCallback(_handleWebFirstFrame);
     }
-    _pipelineOwner.attach(_manifold);
+    addSemanticsEnabledListener(_handleSemanticsEnabledChanged);
+    _handleSemanticsEnabledChanged();
   }
 
   /// The current [RendererBinding], if one has been created.
@@ -199,8 +201,6 @@ mixin RendererBinding on BindingBase, ServicesBinding, SchedulerBinding, Gesture
     }
   }
 
-  late final PipelineManifold _manifold = _BindingPipelineManifold(this);
-
   /// Creates a [RenderView] object to be the root of the
   /// [RenderObject] rendering tree, and initializes it so that it
   /// will be rendered when the next frame is requested.
@@ -330,6 +330,17 @@ mixin RendererBinding on BindingBase, ServicesBinding, SchedulerBinding, Gesture
     super.dispatchEvent(event, hitTestResult);
   }
 
+  SemanticsHandle? _semanticsHandle;
+
+  void _handleSemanticsEnabledChanged() {
+    if (semanticsEnabled) {
+      _semanticsHandle ??= _pipelineOwner.ensureSemantics();
+    } else {
+      _semanticsHandle?.dispose();
+      _semanticsHandle = null;
+    }
+  }
+
   @override
   void performSemanticsAction(SemanticsActionEvent action) {
     _pipelineOwner.semanticsOwner?.performAction(action.nodeId, action.type, action.arguments);
@@ -610,26 +621,3 @@ class RenderingFlutterBinding extends BindingBase with GestureBinding, Scheduler
     return RendererBinding.instance;
   }
 }
-
-/// A [PipelineManifold] implementation that is backed by the [RendererBinding].
-class _BindingPipelineManifold extends ChangeNotifier implements PipelineManifold {
-  _BindingPipelineManifold(this._binding) {
-    _binding.addSemanticsEnabledListener(notifyListeners);
-  }
-
-  final RendererBinding _binding;
-
-  @override
-  void requestVisualUpdate() {
-    _binding.ensureVisualUpdate();
-  }
-
-  @override
-  bool get semanticsEnabled => _binding.semanticsEnabled;
-
-  @override
-  void dispose() {
-    _binding.removeSemanticsEnabledListener(notifyListeners);
-    super.dispose();
-  }
-}