Mac: Fix tab view accessibility.

chrome/browser/ui/cocoa/tabs/tab_strip_view.mm

Index: chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
index 86ac8ce7399bb5bec11f6f9fea33447cbffd92d8..1458026385b54ac8a5e6c89f9232d5853ecdf4b0 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view.mm
@@ -227,13 +227,35 @@
   return NO;
 }
 
+// Returns AX children (tabs and new tab button), sorted from left to right.
+- (NSArray*)accessibilityChildren {
+  NSArray* children =
+      [super accessibilityAttributeValue:NSAccessibilityChildrenAttribute];

[Avi (use Gerrit), 2014/09/23 20:44:21]

Oh, yikes, was it really returning them in Z order? :(

+  return [children sortedArrayUsingComparator:
+      ^NSComparisonResult(id first, id second) {
+          NSPoint firstPosition =
+              [[first accessibilityAttributeValue:
+                          NSAccessibilityPositionAttribute] pointValue];
+          NSPoint secondPosition =
+              [[second accessibilityAttributeValue:
+                           NSAccessibilityPositionAttribute] pointValue];
+          if (firstPosition.x < secondPosition.x)
+            return NSOrderedAscending;
+          else if (firstPosition.x > secondPosition.x)
+            return NSOrderedDescending;
+          else
+            return NSOrderedSame;
+      }];
+}
+
 - (id)accessibilityAttributeValue:(NSString*)attribute {
-  if ([attribute isEqual:NSAccessibilityRoleAttribute])
+  if ([attribute isEqual:NSAccessibilityRoleAttribute]) {
     return NSAccessibilityTabGroupRole;
-  if ([attribute isEqual:NSAccessibilityTabsAttribute]) {
-    NSMutableArray* tabs = [[[NSMutableArray alloc] init] autorelease];
-    NSArray* children =
-        [self accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
+  } else if ([attribute isEqual:NSAccessibilityChildrenAttribute]) {
+    return [self accessibilityChildren];
+  } else if ([attribute isEqual:NSAccessibilityTabsAttribute]) {
+    NSArray* children = [self accessibilityChildren];
+    NSMutableArray* tabs = [NSMutableArray arrayWithCapacity:[children count]];
     for (id child in children) {
       if ([[child accessibilityAttributeValue:NSAccessibilityRoleAttribute]
           isEqual:NSAccessibilityRadioButtonRole]) {
@@ -241,11 +263,11 @@
       }
     }
     return tabs;

[Avi (use Gerrit), 2014/09/23 20:44:20]

If you're already introducing blocks code, you could do

NSIndexSet* indexes = [children indexesOfObjectsPassingTest:^(...){ return
attribute isEqual:buttonRole}];
return [children objectsAtIndexes:indexes];

which is a bit cleaner.

[Andre, 2014/09/23 21:41:55]

Done.
I love programming with higher order functions in place of loops.
In my previous job, I made utilities to make these things even neater.
Something like:
  return Filter(children, ^BOOL(id child) {
      ...
  });

In this case, it would have reduced #lines by 4 instead of by 2.

The filter function takes id<NSFastEnumeration> as argument, so it works with
arrays, sets and dictionaries.
Same with Map, Reduce, Reject, Find, Any.
Maybe we can add these to chromium someday?
I look forward to the day I can program in Swift :-D

[Avi (use Gerrit), 2014/09/23 23:24:54]

I was honestly shocked that Apple didn't already have a block equivalent to
-[NSArray filteredArrayUsingPredicate:]...

-  }
-  if ([attribute isEqual:NSAccessibilityContentsAttribute])
-    return [self accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
-  if ([attribute isEqual:NSAccessibilityValueAttribute])
+  } else if ([attribute isEqual:NSAccessibilityContentsAttribute]) {
+    return [self accessibilityChildren];
+  } else if ([attribute isEqual:NSAccessibilityValueAttribute]) {
     return [controller_ activeTabView];
+  }
 
   return [super accessibilityAttributeValue:attribute];
 }