Switched FlutterPlatformViewSemanticsContainer.semanticsObject to weak.

Author: gaaclarke

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

@@ -160,9 +160,9 @@
     }
   }
 
-  NSObject<FlutterPlatformView>* embedded_view = [factory createWithFrame:CGRectZero
-                                                           viewIdentifier:viewId
-                                                                arguments:params];
+  NSObject<FlutterPlatformView>* embedded_view = [[factory createWithFrame:CGRectZero
+                                                            viewIdentifier:viewId
+                                                                 arguments:params] autorelease];
   // Set a unique view identifier, so the platform view can be identified in unit tests.
   [embedded_view view].accessibilityIdentifier =
       [NSString stringWithFormat:@"platform_view[%ld]", viewId];

shell/platform/darwin/ios/framework/Source/SemanticsObject.mm

@@ -508,8 +508,12 @@ - (UIAccessibilityTraits)accessibilityTraits {
 
 @end
 
+@interface FlutterPlatformViewSemanticsContainer ()
+@property(nonatomic, assign) SemanticsObject* semanticsObject;
+@property(nonatomic, strong) UIView* platformView;
+@end
+
 @implementation FlutterPlatformViewSemanticsContainer {
-  SemanticsObject* _semanticsObject;
   UIView* _platformView;
 }
 
@@ -531,13 +535,22 @@ - (instancetype)initWithSemanticsObject:(SemanticsObject*)object {
     flutter::FlutterPlatformViewsController* controller =
         object.bridge->GetPlatformViewsController();
     if (controller) {
-      _platformView = [controller->GetPlatformViewByID(object.node.platformViewId) view];
+      _platformView = [[controller->GetPlatformViewByID(object.node.platformViewId) view] retain];
     }
-    self.accessibilityElements = @[ _semanticsObject, _platformView ];
   }
   return self;
 }
 
+- (void)dealloc {
+  [_platformView release];
+  _platformView = nil;
+  [super dealloc];
+}
+
+- (NSArray*)accessibilityElements {
+  return @[ _semanticsObject, _platformView ];
+}
+
 - (CGRect)accessibilityFrame {
   return _semanticsObject.accessibilityFrame;
 }

shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm

@@ -133,10 +133,6 @@
   NSMutableArray<NSNumber*>* doomed_uids = [NSMutableArray arrayWithArray:[objects_.get() allKeys]];
   if (root)
     VisitObjectsRecursivelyAndRemove(root, doomed_uids);
-
-  for (NSNumber* doomed_uid in doomed_uids) {
-    ((SemanticsObject*)objects_.get()[doomed_uid]).platformViewSemanticsContainer = nil;
-  }
   [objects_ removeObjectsForKeys:doomed_uids];
 
   layoutChanged = layoutChanged || [doomed_uids count] > 0;
@@ -247,9 +243,6 @@ static bool DidFlagChange(const flutter::SemanticsNode& oldNode,
 }
 
 void AccessibilityBridge::clearState() {
-  for (SemanticsObject* object in objects_.get().allValues) {
-    object.platformViewSemanticsContainer = nil;
-  }
   [objects_ removeAllObjects];
   previous_route_id_ = 0;
   previous_routes_.clear();

shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm

@@ -13,14 +13,22 @@
 
 FLUTTER_ASSERT_NOT_ARC
 @class MockPlatformView;
-MockPlatformView* mockPlatformView = nil;
+static MockPlatformView* gMockPlatformView = nil;
 
 @interface MockPlatformView : UIView
 @end
 @implementation MockPlatformView
 
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    gMockPlatformView = self;
+  }
+  return self;
+}
+
 - (void)dealloc {
-  mockPlatformView = nil;
+  gMockPlatformView = nil;
   [super dealloc];
 }
 
@@ -34,15 +42,14 @@ @implementation MockFlutterPlatformView
 
 - (instancetype)init {
   if (self = [super init]) {
-    MockPlatformView* view = [[MockPlatformView new] autorelease];
-    mockPlatformView = view;
-    self.view = view;
+    _view = [[MockPlatformView alloc] init];
   }
   return self;
 }
 
 - (void)dealloc {
-  self.view = nil;
+  [_view release];
+  _view = nil;
   [super dealloc];
 }
 
@@ -55,8 +62,7 @@ @implementation MockFlutterPlatformFactory
 - (NSObject<FlutterPlatformView>*)createWithFrame:(CGRect)frame
                                    viewIdentifier:(int64_t)viewId
                                         arguments:(id _Nullable)args {
-  MockFlutterPlatformView* platformView = [[MockFlutterPlatformView new] autorelease];
-  return platformView;
+  return [[MockFlutterPlatformView alloc] init];
 }
 
 @end
@@ -197,8 +203,8 @@ - (void)testSemanticsDeallocated {
     id mockFlutterView = OCMClassMock([FlutterView class]);
     std::string label = "some label";
 
-    flutter::FlutterPlatformViewsController* flutterPlatformViewsController =
-        (flutter::FlutterPlatformViewsController*)(new flutter::FlutterPlatformViewsController());
+    auto flutterPlatformViewsController =
+        std::make_unique<flutter::FlutterPlatformViewsController>();
     flutterPlatformViewsController->SetFlutterView(mockFlutterView);
 
     MockFlutterPlatformFactory* factory = [[MockFlutterPlatformFactory new] autorelease];
@@ -213,10 +219,10 @@ - (void)testSemanticsDeallocated {
                            arguments:@{@"id" : @2, @"viewType" : @"MockFlutterPlatformView"}],
         result);
 
-    __block auto bridge = std::make_unique<flutter::AccessibilityBridge>(
+    auto bridge = std::make_unique<flutter::AccessibilityBridge>(
         /*view=*/mockFlutterView,
         /*platform_view=*/platform_view.get(),
-        /*platform_views_controller=*/flutterPlatformViewsController);
+        /*platform_views_controller=*/flutterPlatformViewsController.get());
 
     flutter::SemanticsNodeUpdates nodes;
     flutter::SemanticsNode semantics_node;
@@ -227,9 +233,8 @@ - (void)testSemanticsDeallocated {
     flutter::CustomAccessibilityActionUpdates actions;
     bridge->UpdateSemantics(/*nodes=*/nodes, /*actions=*/actions);
     flutterPlatformViewsController->Reset();
-    delete flutterPlatformViewsController;
   }
-  XCTAssertNil(mockPlatformView);
+  XCTAssertNil(gMockPlatformView);
 }
 
 @end