Rebase all

Author: dkwingsmt

shell/platform/darwin/macos/framework/Headers/FlutterEngine.h

@@ -23,7 +23,7 @@
  * Some single-view APIs will eventually be replaced by their multi-view
  * variant. During the deprecation period, the single-view APIs will coexist with
  * and work with the multi-view APIs as if the other views don't exist.  For
- * backward compatibility, single-view APIs will always operate the view with
+ * backward compatibility, single-view APIs will always operate on the view with
  * this ID. Also, the first view assigned to the engine will also have this ID.
  */
 extern const uint64_t kFlutterDefaultViewId;

shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm

@@ -32,17 +32,15 @@ void DispatchMacOSNotification(gfx::NativeViewAccessible native_node,
 }  // namespace
 }  // namespace flutter::testing
 
-@interface AccessibilityBridgeTestEngine : FlutterEngine
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController;
+@interface AccessibilityBridgeTestViewController : FlutterViewController
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine;
 @end
 
-@implementation AccessibilityBridgeTestEngine
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController {
-  return std::make_shared<flutter::testing::AccessibilityBridgeMacSpy>(engine, viewController);
+@implementation AccessibilityBridgeTestViewController
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine {
+  return std::make_shared<flutter::testing::AccessibilityBridgeMacSpy>(engine, self);
 }
 @end
 
@@ -56,10 +54,7 @@ @implementation AccessibilityBridgeTestEngine
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
              ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterEngine* engine = [[AccessibilityBridgeTestEngine alloc] initWithName:@"test"
-                                                                      project:project
-                                                       allowHeadlessExecution:true];
-  return [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  return [[AccessibilityBridgeTestViewController alloc] initWithProject:project];
 }
 }  // namespace
 
@@ -76,8 +71,8 @@ @implementation AccessibilityBridgeTestEngine
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
+  auto bridge = std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
   FlutterSemanticsNode root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
@@ -124,8 +119,8 @@ @implementation AccessibilityBridgeTestEngine
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
+  auto bridge = std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
   FlutterSemanticsNode root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
@@ -171,8 +166,8 @@ @implementation AccessibilityBridgeTestEngine
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
+  auto bridge = std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
   FlutterSemanticsNode root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);

shell/platform/darwin/macos/framework/Source/FlutterEngine.mm

@@ -194,9 +194,6 @@ @implementation FlutterEngine {
   // The embedding-API-level engine object.
   FLUTTER_API_SYMBOL(FlutterEngine) _engine;
 
-  // The private member for accessibility.
-  std::shared_ptr<flutter::AccessibilityBridgeMac> _bridge;
-
   // The project being run by this engine.
   FlutterDartProject* _project;
 
@@ -315,7 +312,7 @@ - (BOOL)runWithEntrypoint:(NSString*)entrypoint {
   flutterArguments.update_semantics_callback = [](const FlutterSemanticsUpdate* update,
                                                   void* user_data) {
     FlutterEngine* engine = (__bridge FlutterEngine*)user_data;
-    [engine updateSemantics:update];
+    [engine.viewController updateSemantics:update];
   };
   flutterArguments.custom_dart_entrypoint = entrypoint.UTF8String;
   flutterArguments.shutdown_dart_vm_when_done = true;
@@ -543,10 +540,6 @@ - (void)sendInitialSettings {
   return _embedderAPI;
 }
 
-- (std::weak_ptr<flutter::AccessibilityBridgeMac>)accessibilityBridge {
-  return _bridge;
-}
-
 - (nonnull NSString*)executableName {
   return [[[NSProcessInfo processInfo] arguments] firstObject] ?: @"Flutter";
 }
@@ -586,24 +579,10 @@ - (void)setSemanticsEnabled:(BOOL)enabled {
     return;
   }
   _semanticsEnabled = enabled;
-  // Remove the accessibility children from flutter view before reseting the bridge.
-  if (!_semanticsEnabled && self.viewController.viewLoaded) {
-    self.viewController.flutterView.accessibilityChildren = nil;
-  }
-  if (!_semanticsEnabled && _bridge) {
-    _bridge.reset();
-  } else if (_semanticsEnabled && !_bridge) {
-    _bridge = [self createAccessibilityBridge:self viewController:self.viewController];
-  }
+  [_viewController notifySemanticsEnabledChanged];
   _embedderAPI.UpdateSemanticsEnabled(_engine, _semanticsEnabled);
 }
 
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController {
-  return std::make_shared<flutter::AccessibilityBridgeMac>(engine, _viewController);
-}
-
 - (void)dispatchSemanticsAction:(FlutterSemanticsAction)action
                        toTarget:(uint16_t)target
                        withData:(fml::MallocMapping)data {
@@ -939,36 +918,6 @@ - (BOOL)unregisterTextureWithID:(int64_t)textureID {
   return _embedderAPI.UnregisterExternalTexture(_engine, textureID) == kSuccess;
 }
 
-- (void)updateSemantics:(const FlutterSemanticsUpdate*)update {
-  NSAssert(_bridge, @"The accessibility bridge must be initialized.");
-  for (size_t i = 0; i < update->nodes_count; i++) {
-    const FlutterSemanticsNode* node = &update->nodes[i];
-    _bridge->AddFlutterSemanticsNodeUpdate(node);
-  }
-
-  for (size_t i = 0; i < update->custom_actions_count; i++) {
-    const FlutterSemanticsCustomAction* action = &update->custom_actions[i];
-    _bridge->AddFlutterSemanticsCustomActionUpdate(action);
-  }
-
-  _bridge->CommitUpdates();
-
-  // Accessibility tree can only be used when the view is loaded.
-  if (!self.viewController.viewLoaded) {
-    return;
-  }
-  // Attaches the accessibility root to the flutter view.
-  auto root = _bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
-  if (root) {
-    if ([self.viewController.flutterView.accessibilityChildren count] == 0) {
-      NSAccessibilityElement* native_root = root->GetNativeViewAccessible();
-      self.viewController.flutterView.accessibilityChildren = @[ native_root ];
-    }
-  } else {
-    self.viewController.flutterView.accessibilityChildren = nil;
-  }
-}
-
 #pragma mark - Task runner integration
 
 - (void)runTaskOnEmbedder:(FlutterTask)task {

shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm

@@ -348,6 +348,31 @@ - (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable
   EXPECT_EQ(engine.viewController, nil);
 }
 
+TEST_F(FlutterEngineTest, ProducesAccessibilityTreeWhenAddingViews) {
+  FlutterEngine* engine = GetFlutterEngine();
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+
+  // Enable the semantics without attaching a view controller.
+  bool enabled_called = false;
+  engine.embedderAPI.UpdateSemanticsEnabled =
+      MOCK_ENGINE_PROC(UpdateSemanticsEnabled, ([&enabled_called](auto engine, bool enabled) {
+                         enabled_called = enabled;
+                         return kSuccess;
+                       }));
+  engine.semanticsEnabled = YES;
+  EXPECT_TRUE(enabled_called);
+
+  EXPECT_EQ(engine.viewController, nil);
+
+  // Assign the view controller after enabling semantics
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  engine.viewController = viewController;
+
+  EXPECT_NE(viewController.accessibilityBridge.lock(), nullptr);
+}
+
 TEST_F(FlutterEngineTest, NativeCallbacks) {
   fml::AutoResetWaitableEvent latch;
   bool latch_called = false;

shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h

@@ -31,8 +31,6 @@
  */
 @property(nonatomic) FlutterEngineProcTable& embedderAPI;
 
-@property(nonatomic, readonly) std::weak_ptr<flutter::AccessibilityBridgeMac> accessibilityBridge;
-
 /**
  * True if the semantics is enabled. The Flutter framework starts sending
  * semantics update through the embedder as soon as it is set to YES.
@@ -94,14 +92,3 @@
                        withData:(fml::MallocMapping)data;
 
 @end
-
-@interface FlutterEngine (TestMethods)
-/* Creates an accessibility bridge with the provided parameters.
- *
- * By default this method calls AccessibilityBridgeMac's initializer. Exposing
- * this method allows unit tests to override in order to capture information.
- */
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController;
-@end

shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm

@@ -33,7 +33,7 @@
   FlutterViewController* viewController = CreateTestViewController();
   FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
   FlutterSemanticsNode root;
   root.id = 0;
@@ -69,7 +69,7 @@
   FlutterViewController* viewController = CreateTestViewController();
   FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
   FlutterSemanticsNode root;
   root.id = 0;
@@ -111,7 +111,7 @@
   FlutterViewController* viewController = CreateTestViewController();
   FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
   FlutterSemanticsNode root;
   root.id = 0;
@@ -158,7 +158,7 @@
   window.contentView = viewController.view;
 
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
   FlutterSemanticsNode root;
   root.id = 0;
@@ -233,7 +233,7 @@
   window.contentView = viewController.view;
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
   FlutterSemanticsNode root;
   root.id = 0;

shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm

@@ -1414,14 +1414,14 @@ - (bool)testSelectorsAreForwardedToFramework {
 
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
   ui::AXTree tree;
   ui::AXNode ax_node(&tree, nullptr, 0, 0);
   ui::AXNodeData node_data;
   node_data.SetValue("initial text");
   ax_node.SetData(node_data);
-  delegate.Init(engine.accessibilityBridge, &ax_node);
+  delegate.Init(viewController.accessibilityBridge, &ax_node);
   {
     FlutterTextPlatformNode text_platform_node(&delegate, viewController);
 
@@ -1480,14 +1480,14 @@ - (bool)testSelectorsAreForwardedToFramework {
 
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
   ui::AXTree tree;
   ui::AXNode ax_node(&tree, nullptr, 0, 0);
   ui::AXNodeData node_data;
   node_data.SetValue("initial text");
   ax_node.SetData(node_data);
-  delegate.Init(engine.accessibilityBridge, &ax_node);
+  delegate.Init(viewController.accessibilityBridge, &ax_node);
   FlutterTextPlatformNode text_platform_node(&delegate, viewController);
 
   FlutterTextField* textField = text_platform_node.GetNativeViewAccessible();

shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm

@@ -41,14 +41,14 @@
 
     engine.semanticsEnabled = YES;
 
-    auto bridge = engine.accessibilityBridge.lock();
+    auto bridge = viewController.accessibilityBridge.lock();
     FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
     ui::AXTree tree;
     ui::AXNode ax_node(&tree, nullptr, 0, 0);
     ui::AXNodeData node_data;
     node_data.SetValue("initial text");
     ax_node.SetData(node_data);
-    delegate.Init(engine.accessibilityBridge, &ax_node);
+    delegate.Init(viewController.accessibilityBridge, &ax_node);
     // Verify that a FlutterTextField is attached to the view.
     FlutterTextPlatformNode text_platform_node(&delegate, viewController);
     id native_accessibility = text_platform_node.GetNativeViewAccessible();