@@ -53,17 +53,17 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
5353 ios_delegate_(ios_delegate ? std::move(ios_delegate)
5454 : std::make_unique<DefaultIosDelegate>()),
5555 weak_factory_(this ) {
56- accessibility_channel_. reset ( [[FlutterBasicMessageChannel alloc ]
56+ accessibility_channel_ = [[FlutterBasicMessageChannel alloc ]
5757 initWithName: @" flutter/accessibility"
5858 binaryMessenger: platform_view->GetOwnerViewController ().engine.binaryMessenger
59- codec: [FlutterStandardMessageCodec sharedInstance ]]) ;
60- [accessibility_channel_. get () setMessageHandler: ^(id message, FlutterReply reply) {
59+ codec: [FlutterStandardMessageCodec sharedInstance ]];
60+ [accessibility_channel_ setMessageHandler: ^(id message, FlutterReply reply) {
6161 HandleEvent ((NSDictionary *)message);
6262 }];
6363}
6464
6565AccessibilityBridge::~AccessibilityBridge () {
66- [accessibility_channel_. get () setMessageHandler: nil ];
66+ [accessibility_channel_ setMessageHandler: nil ];
6767 clearState ();
6868 view_controller_.viewIfLoaded .accessibilityElements = nil ;
6969}
@@ -74,7 +74,7 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
7474
7575void AccessibilityBridge::AccessibilityObjectDidBecomeFocused (int32_t id ) {
7676 last_focused_semantics_object_id_ = id ;
77- [accessibility_channel_. get () sendMessage: @{@" type" : @" didGainFocus" , @" nodeId" : @(id )}];
77+ [accessibility_channel_ sendMessage: @{@" type" : @" didGainFocus" , @" nodeId" : @(id )}];
7878}
7979
8080void AccessibilityBridge::AccessibilityObjectDidLoseFocus (int32_t id ) {
@@ -152,7 +152,7 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
152152 }
153153 }
154154
155- SemanticsObject* root = objects_. get () [@(kRootNodeId )];
155+ SemanticsObject* root = objects_[@(kRootNodeId )];
156156
157157 bool routeChanged = false ;
158158 SemanticsObject* lastAdded = nil ;
@@ -196,13 +196,13 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
196196 view_controller_.viewIfLoaded .accessibilityElements = nil ;
197197 }
198198
199- NSMutableArray <NSNumber *>* doomed_uids = [NSMutableArray arrayWithArray: [ objects_ allKeys ] ];
199+ NSMutableArray <NSNumber *>* doomed_uids = [NSMutableArray arrayWithArray: objects_. allKeys];
200200 if (root) {
201201 VisitObjectsRecursivelyAndRemove (root, doomed_uids);
202202 }
203203 [objects_ removeObjectsForKeys: doomed_uids];
204204
205- for (SemanticsObject* object in [ objects_ allValues ] ) {
205+ for (SemanticsObject* object in objects_. allValues ) {
206206 [object accessibilityBridgeDidFinishUpdate ];
207207 }
208208
@@ -217,8 +217,7 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
217217
218218 if (layoutChanged) {
219219 SemanticsObject* next = FindNextFocusableIfNecessary ();
220- SemanticsObject* lastFocused =
221- [objects_.get () objectForKey: @(last_focused_semantics_object_id_)];
220+ SemanticsObject* lastFocused = [objects_ objectForKey: @(last_focused_semantics_object_id_)];
222221 // Only specify the focus item if the new focus is different, avoiding double focuses on the
223222 // same item. See: https://github.com/flutter/flutter/issues/104176. If there is a route
224223 // change, we always refocus.
@@ -290,10 +289,10 @@ static bool DidFlagChange(const flutter::SemanticsNode& oldNode,
290289
291290SemanticsObject* AccessibilityBridge::GetOrCreateObject (int32_t uid,
292291 flutter::SemanticsNodeUpdates& updates) {
293- SemanticsObject* object = objects_. get () [@(uid)];
292+ SemanticsObject* object = objects_[@(uid)];
294293 if (!object) {
295294 object = CreateObject (updates[uid], GetWeakPtr ());
296- objects_. get () [@(uid)] = object;
295+ objects_[@(uid)] = object;
297296 } else {
298297 // Existing node case
299298 auto nodeEntry = updates.find (object.node .id );
@@ -309,7 +308,7 @@ static bool DidFlagChange(const flutter::SemanticsNode& oldNode,
309308 // SemanticsObject implementation. Instead, we replace it with a new
310309 // instance.
311310 SemanticsObject* newSemanticsObject = CreateObject (node, GetWeakPtr ());
312- ReplaceSemanticsObject (object, newSemanticsObject, objects_. get () );
311+ ReplaceSemanticsObject (object, newSemanticsObject, objects_);
313312 object = newSemanticsObject;
314313 }
315314 }
@@ -332,11 +331,11 @@ static bool DidFlagChange(const flutter::SemanticsNode& oldNode,
332331 }
333332
334333 // Tries to refocus the previous focused semantics object to avoid random jumps.
335- return FindFirstFocusable ([ objects_. get () objectForKey: @(last_focused_semantics_object_id_)]);
334+ return FindFirstFocusable (objects_[ @(last_focused_semantics_object_id_)]);
336335}
337336
338337SemanticsObject* AccessibilityBridge::FindFirstFocusable (SemanticsObject* parent) {
339- SemanticsObject* currentObject = parent ?: objects_. get () [@(kRootNodeId )];
338+ SemanticsObject* currentObject = parent ?: objects_[@(kRootNodeId )];
340339 if (!currentObject) {
341340 return nil ;
342341 }
@@ -360,7 +359,7 @@ static bool DidFlagChange(const flutter::SemanticsNode& oldNode,
360359 ios_delegate_->PostAccessibilityNotification (UIAccessibilityAnnouncementNotification, message);
361360 }
362361 if ([type isEqualToString: @" focus" ]) {
363- SemanticsObject* node = objects_. get () [annotatedEvent[@" nodeId" ]];
362+ SemanticsObject* node = objects_[annotatedEvent[@" nodeId" ]];
364363 ios_delegate_->PostAccessibilityNotification (UIAccessibilityLayoutChangedNotification, node);
365364 }
366365}
0 commit comments