fix: Add ContentsView to AXChildren (electron#22399)

felixrieseberg · web-flow · commit cad7054e4f10 · 2020-03-02T11:25:40.000+09:00
diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm
@@ -121,7 +121,18 @@ - (id)accessibilityAttributeValue:(NSString*)attribute {
                           [NSButtonCell class], @"RenderWidgetHostViewCocoa"];
 
   NSArray* children = [super accessibilityAttributeValue:attribute];
-  return [children filteredArrayUsingPredicate:predicate];
+  NSMutableArray* mutableChildren = [[children mutableCopy] autorelease];
+  [mutableChildren filterUsingPredicate:predicate];
+
+  // We need to add the web contents: Without us doing so, VoiceOver
+  // users will be able to navigate up the a11y tree, but not back down.
+  // The content view contains the "web contents", which VoiceOver
+  // immediately understands.
+  NSView* contentView =
+      [shell_->GetNativeWindow().GetNativeNSWindow() contentView];
+  [mutableChildren addObject:contentView];
+
+  return mutableChildren;
 }
 
 - (NSString*)accessibilityTitle {
